联调工作流

.gitignore

@@ -45,3 +45,16 @@ Thumbs.db
 /.idea/artifacts/jyzb3.xml
 /jyzb-mq/jyzb-mq-consumer/target/classes/application.yml
 /jyzb-mq/jyzb-mq-producer/target/classes/application.yml
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-producer/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+/jyzb-mq/jyzb-mq-consumer/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+/jyzb-boot/src/main/resources/application.yml

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java

-//package com.junmp.jyzb.api.bean.dto;
-//
-//import lombok.Data;
-//
-//@Data
-//public class EquipmentSizeDto {
-//    /**
-//     * 号型ID
-//     */
-//    private String id;
-//
-//    /**
-//     * 号型名称
-//     */
-//    private String name;
-//}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSupplierDto.java

-//package com.junmp.jyzb.api.bean.dto;
-//
-//import lombok.Data;
-//
-//@Data
-//public class EquipmentSupplierDto {
-//    /**
-//     * 类型ID
-//     */
-//    private String id;
-//
-//    /**
-//     * 类型名称
-//     */
-//    private String name;
-//}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTypeDto.java

-//package com.junmp.jyzb.api.bean.dto;
-//
-//import lombok.Data;
-//
-//@Data
-//public class EquipmentTypeDto {
-//    /**
-//     * 类型ID
-//     */
-//    private String id;
-//
-//    /**
-//     * 类型名称
-//     */
-//    private String name;
-//
-//}

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Inventory.java

@@ -100,7 +100,7 @@ public class Inventory implements Serializable {
      * 质保期
      */
     @TableField("warranty_period")
-    private int warrantyPeriod;
+    private long warrantyPeriod;
 
     /**
      * 维保期
@@ -113,7 +113,11 @@ public class Inventory implements Serializable {
      */
     @TableField("fix_count")
     private int fixCount;
-
+    /**
+     * 维修次数
+     */
+    @TableField("term_state")
+    private int TermState;
     /**
      * 位置类型
      */

jyzb-biz/src/main/java/com/junmp/jyzb/task/InvExpireMsg.java

 package com.junmp.jyzb.task;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.jyzb.api.util.GenCodeUtil;
 import com.junmp.jyzb.entity.Company;
+import com.junmp.jyzb.entity.Inventory;
+import com.junmp.jyzb.entity.ProductSku;
 import com.junmp.jyzb.mapper.ExpireMapper;
 import com.junmp.jyzb.mapper.MsgMapper;
+import com.junmp.jyzb.service.InventoryService;
 import com.junmp.v2.common.util.BeanPlusUtil;
+import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.job.api.JobAction;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
@@ -17,8 +28,8 @@ import java.util.Map;
 * @Author: Zhaojw
 * @Description: 过期物资消息提醒
 * @DateTime: 2023/7/14 16:25
-* @Params: 
-* @Return 
+* @Params:
+* @Return
 */
 @Slf4j
 @Component
@@ -27,13 +38,48 @@ public class InvExpireMsg implements JobAction {
     @Resource
     private ExpireMapper ExpireMapper;
     @Resource
-    private ExpireMapper InvertoryMapper;
+    private InventoryService inventoryService;
 
     @Override
     public void action() {
-        Company company = new Company();
-//        int InvCount=
-        Map<String,Object> oneMsg = ExpireMapper.QueryTop1000ExpireInv();
+        LambdaQueryWrapper<Inventory> wrapper = new LambdaQueryWrapper<>();
+        // 分页参数
+        int pageSize = 1000; // 每页记录数，可以根据需求调整
+        int currentPage = 1; // 当前页数
 
+        //所有待判断的物资
+        wrapper.eq( Inventory::getTermState, 0);
+        long termCount= inventoryService.count(wrapper);
+
+        if (termCount>0)
+        {
+            // 分页查询
+            while ((currentPage - 1) * pageSize < termCount) {
+                processPageData( currentPage, pageSize);
+                currentPage++;
+        }
+
+        }
+
+    }
+
+    // 处理每页数据
+    private void processPageData(long pageSize, long currentPage)
+    {
+
+        LocalDate localdate =LocalDate.now();
+        // 使用LambdaQueryWrapper构建查询条件
+        LambdaQueryWrapper<Inventory> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq( Inventory::getTermState, 0);
+        wrapper.apply("production_date <= DATE_SUB({0}, INTERVAL warranty_period DAY)", localdate);
+        //获取过质保期的物资信息
+        List<Inventory> page= inventoryService.page(PageFactory.getDefaultPage(pageSize,currentPage),wrapper).getRecords();
+        page.forEach(o->o.setTermState(1));
+        inventoryService.saveOrUpdateBatch(page);
+
+
+//        Page<Inventory> page = inventoryService.page(PageFactory.getDefaultPage(), wrapper)
     }
+
+
 }

jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java

@@ -77,7 +77,7 @@ public class BpmnController  {
 
     }
     /**
-     * 编辑表单
+     * 修改表单
      */
     @ApiOperation("修改表单")
     @PutMapping("updateForm")
@@ -85,7 +85,16 @@ public class BpmnController  {
         return WorkProcessService.updateForm(process);
     }
     /**
-     * 编辑表单
+     * 修改表单名称和备注
+     */
+    @ApiOperation("修改表单名称和备注")
+    @PostMapping("updateFormName")
+    public ApiRes<Boolean> updateFormName(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
+        return  ApiRes.success(WorkProcessService.updateFormName(process));
+    }
+
+    /**
+     * 转交
      */
     @ApiOperation("轉交")
     @PutMapping("turn")
@@ -103,7 +112,6 @@ public class BpmnController  {
     public PageResult<HistoryProcessInstanceVO> applyList(@RequestBody ApplyDTO ApplyDTO) {
         return WorkProcessService.applyList(ApplyDTO);
     }
-
     @ApiOperation("查看我的待办")
     @PostMapping("toDoList")
     public PageResult<TaskVO> toDoList(@RequestBody TaskDTO taskDTO){

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java

@@ -32,7 +32,16 @@ public interface WorkProcessService {
      *
      * @return
      */
-    ResponseResult updateForm(UpdateProcessVO process) throws JsonProcessingException;
+    ResponseResult updateForm(UpdateProcessVO process)
+            throws JsonProcessingException;
+
+    /**
+     * 编辑表单名称
+     *
+     * @return
+     */
+    Boolean updateFormName(UpdateProcessVO process);
+
     ResponseResult turn(TurnVo turns);
 
     /**

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/UpdateProcessVO.java

@@ -4,8 +4,9 @@ import lombok.Data;
 
 @Data
 public class UpdateProcessVO {
-    private String formId;
+    private String templateId;
     private String formJson;
     private String formName;
     private String processJson;
+    private String remark;
 }