Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

# Conflicts:
#	jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

.gitignore

@@ -113,3 +113,5 @@ Thumbs.db
 /jyzb-biz/pom.xml
 /.idea/compiler.xml
 /jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
+/jyzb-boot/src/main/resources/application-local.yml
+/jyzb-boot/src/main/resources/application-local.yml

.idea/dataSources.xml

@@ -7,5 +7,12 @@
       <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
       <jdbc-url>jdbc:mysql://192.168.3.128:3306/db_jyzb?characterEncoding=UTF-8&amp;useUnicode=true&amp;useSSL=false&amp;tinyInt1isBit=false&amp;allowPublicKeyRetrieval=true&amp;serverTimezone=Asia/Shanghai</jdbc-url>
     </data-source>
+    <data-source source="LOCAL" name="local" uuid="134b9a70-dbff-479c-9337-8e4869b6525e">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://127.0.0.1:3306/junmp?characterEncoding=UTF-8&amp;useUnicode=true&amp;useSSL=false&amp;tinyInt1isBit=false&amp;allowPublicKeyRetrieval=true&amp;serverTimezone=Asia/Shanghai</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
   </component>
 </project>
\ No newline at end of file

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

@@ -27,7 +27,7 @@ public class BusFormDto  {
     /**
      * 单据编号
      */
-    private String orderCode;
+    private String bussinessCode;
 
     /**
      * 组织机构id

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

@@ -22,6 +22,7 @@ public class OrderMainDto implements Serializable {
 
     //订单编号
     private String orderCode;
+    private String bussinessCode;
 
     //发物单位
     private Long startOrgId;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java

@@ -48,6 +48,8 @@ public class OrderDetailReq extends BaseRequest {
 
     private String updateUser;
 
+    private String warehouseId;
+
     /**
      * 修改后数量
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java

@@ -24,6 +24,7 @@ public class OrderMainReq extends BaseRequest {
     private String bussinessType;
 
     private String orderCode;
+    private String bussinessCode;
 
     private Long startOrgId;
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderUploadReq.java

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- *
+ *单据状态上报请求实体类
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PoliceReassignmentReq.java

@@ -21,4 +21,8 @@ public class PoliceReassignmentReq {
     //需要带走的装备信息列表
     private List<FormEqsReq> eqsReqList;
 
+    //调岗原因
+    private String note;
+    //工作流id
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryBusFormReq.java

@@ -31,7 +31,7 @@ public class QueryBusFormReq extends BaseRequest {
     /**
      * 单据编号
      */
-    private String orderCode;
+    private String bussinessCode;
 
     /**
      * 组织机构id

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/BaseOrderItemReq.java

@@ -9,6 +9,9 @@ import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
 import java.util.Date;
 
+/**
+ * 个人装备移交、报废、维修的子单据请求实体类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class BaseOrderItemReq extends BaseRequest {

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/BaseOrderReq.java

@@ -11,6 +11,9 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 个人装备移交、报废、维修请求实体类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class BaseOrderReq extends BaseRequest {

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/BatchEditingInvsReq.java

@@ -7,6 +7,9 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 装备批量信息修改的请求实体类
+ */
 @Data
 public class BatchEditingInvsReq {
     /**

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/DetailListReq.java

@@ -5,6 +5,9 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+/**
+ * 记账时的子单据请求实体类
+ */
 @Data
 public class DetailListReq implements Serializable {
     /**

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/EquipmentBindReq.java

@@ -9,6 +9,9 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
+/**
+ * 装备绑定箱门请求实体类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class EquipmentBindReq extends BaseRequest {

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/ManufacturerReq.java

@@ -7,6 +7,9 @@ import javax.validation.constraints.NotBlank;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 生产厂商请求实体类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ManufacturerReq extends BaseRequest {

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateBusFormReq.java

@@ -18,10 +18,11 @@ public class UpdateBusFormReq extends BaseRequest {
     @NotBlank(message = "单据id不能为空",groups = {edit.class})
     private String id;
 
+    private String userId;
     /**
      * 工作流id
      */
-    private String processId;
+    private String processDefinitionId;
 
     /**
      * 单据业务类型
@@ -32,7 +33,7 @@ public class UpdateBusFormReq extends BaseRequest {
     /**
      * 单据编号
      */
-    private String orderCode;
+    private String bussinessCode;
 
     /**
      * 组织机构id

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java

@@ -31,7 +31,6 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
     private String  processDefinitionId;
 
 
-
     /**
      * 单据业务类型
      */
@@ -41,6 +40,8 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      * 订单号
      */
     private String  orderCode;
+
+    private String bussinessCode;
     /**
      * 发物单位
      */

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateStocktakeReq.java

@@ -15,10 +15,11 @@ public class UpdateStocktakeReq extends BaseRequest {
     @NotBlank(message = "id不能为空",groups = {edit.class})
     private String id;
 
+    private String userId;
     /**
      * 工作流
      */
-    private String processId;
+    private String processDefinitionId;
 
     /**
      * 单据业务类型：盘库stocktake

jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java

@@ -35,7 +35,7 @@ public class BussinessController {
     @ApiOperation("创建业务单")
     public ApiRes<String> AddBussinessOrder(@RequestBody @Validated(ValidationApi.add.class) UpdateBusFormReq req){
         //判断是否有工作流id，如果有则将状态进行修改
-        if (ObjectUtil.isEmpty(req.getProcessId()))
+        if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
         {
             req.setExamineState("none");
         }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java

@@ -126,9 +126,14 @@ public class PoliceController {
     }
 
 
+    @PostMapping("/PoliceReassignment")
+    @ApiOperation("警员调岗申请单")
+    public ApiRes<String> PoliceReassignment(){
+        return ApiRes.success(policemanService.PoliceReassignment());
+    }
 
     @PostMapping("/ChangePoliceOrg")
-    @ApiOperation("警员调岗")
+    @ApiOperation("警员调岗（业务过程）")
     public ApiRes<Boolean> changePoliceOrg(@RequestBody @Validated(ValidationApi.edit.class)PoliceReassignmentReq req){
         return ApiRes.success(policemanService.changePoliceOrg(req));
     }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/StocktakeController.java

 package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.junmp.jyzb.api.bean.dto.StocktakeDto;
 import com.junmp.jyzb.api.bean.query.StocktakeReq;
-import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
-import com.junmp.jyzb.entity.OrderNum;
 import com.junmp.jyzb.entity.Stocktake;
 import com.junmp.jyzb.service.StocktakeService;
 import com.junmp.v2.common.bean.request.ValidationApi;
@@ -24,7 +21,7 @@ import javax.annotation.Resource;
 
 @RestController
 @Slf4j
-@Api("盘库管理")
+@Api(tags ="盘库管理")
 @RequestMapping("/Stocktake")
 public class StocktakeController {
 
@@ -36,7 +33,7 @@ public class StocktakeController {
     @ApiOperation("盘库申请")
     public ApiRes<String> AddStocktakeOrder (@RequestBody @Validated(ValidationApi.add.class) UpdateStocktakeReq req){
         //判断是否有工作流id，如果有则将状态进行修改
-        if (ObjectUtil.isEmpty(req.getProcessId()))
+        if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
         {
             req.setExamineState("none");
         }
@@ -56,7 +53,7 @@ public class StocktakeController {
 
     //修改单据
     @PostMapping("/UpdateStocktakeOrder")
-    @ApiOperation("修改任务单")
+    @ApiOperation("修改盘库业务单")
     public ApiRes<Boolean> UpdateStocktakeOrder(@RequestBody @Validated(ValidationApi.edit.class) UpdateStocktakeReq req) {
         return ApiRes.success(stocktakeService.UpdateStocktakeOrder(req));
     }

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

@@ -35,8 +35,8 @@ public class BusForm implements Serializable {
     /**
      * 单据编号
      */
-    @TableField(value = "order_code")
-    private String orderCode;
+    @TableField(value = "bussiness_code")
+    private String bussinessCode;
 
     /**
      * 组织机构id

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

@@ -29,6 +29,9 @@ public class OrderMain implements Serializable {
     @TableField("order_code")
     private String orderCode;
 
+    @TableField("bussiness_code")
+    private String bussinessCode;
+
     @TableField("start_org_id")
     private Long startOrgId;
 

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 警员调岗申请单
+ * @TableName bussiness_reassignment
+ */
+@TableName(value ="bussiness_reassignment")
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class Reassignment implements Serializable {
+    /**
+     * id
+     */
+
+    private String id;
+
+    /**
+     * 工作流id
+     */
+    @TableField(value = "process_id")
+    private String processId;
+
+    /**
+     * 调岗警员id
+     */
+    @TableField(value = "police_id")
+    private String policeId;
+
+    /**
+     * 调岗警员姓名
+     */
+    @TableField(value = "police_name")
+    private String policeName;
+
+    /**
+     * 警员带走装备
+     */
+    @TableField(value = "eqs_list")
+    private String eqsList;
+
+    /**
+     * 组织机构id（谁申请，就是谁的组织机构号）
+     */
+    @TableField(value = "org_id")
+    private Long orgId;
+
+    /**
+     * 目标组织机构id
+     */
+    @TableField(value = "target_org_id")
+    private Long targetOrgId;
+
+    /**
+     * 调岗原因
+     */
+    @TableField(value = "note")
+    private String note;
+
+    /**
+     * 审核状态(none未接入工作流，working审批中，finished审批完成)
+     */
+    @TableField(value = "examine_state")
+    private String examineState;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人员
+     */
+    @TableField(value = "create_user")
+    private String createUser;
+
+    /**
+     * 更新人员
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

@@ -75,10 +75,22 @@ public class Stocktake implements Serializable {
     private String shelfId;
 
     /**
-     * 货架位置（类型为1时特有）
+     * 排
      */
-    @TableField(value = "shelf_location")
-    private String shelfLocation;
+    @TableField(value = "shelf_ranges")
+    private Integer shelfRanges;
+
+    /**
+     * 列
+     */
+    @TableField(value = "shelf_columns")
+    private Integer shelfColumns;
+
+    /**
+     * 行
+     */
+    @TableField(value = "shelf_rows")
+    private Integer shelfRows;
 
     /**
      * 号型id（类型为2时特有）

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ReassignmentMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.entity.Reassignment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【bussiness_reassignment(警员调岗申请单)】的数据库操作Mapper
+* @createDate 2023-10-07 16:49:31
+* @Entity com.junmp.jyzb.entity.Reassignment
+*/
+public interface ReassignmentMapper extends BaseMapper<Reassignment> {
+
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java

@@ -74,5 +74,9 @@ public interface PolicemanService extends IService<Policeman> {
     //获取警员的装备信息
     PageResult<PoliceEquipment> GetPoliceEqs(PolicemanReq req);
 
+    //警员调岗业务逻辑
     boolean UpdatePoliceUser();
+
+    //警员调岗申请单
+    String PoliceReassignment();
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/ReassignmentService.java

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.entity.Reassignment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【bussiness_reassignment(警员调岗申请单)】的数据库操作Service
+* @createDate 2023-10-07 16:49:31
+*/
+public interface ReassignmentService extends IService<Reassignment> {
+
+}

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
+import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.BusFormDto;
 import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
 import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
@@ -37,6 +39,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
     @Resource
     public StocktakeService stocktakeService;
 
+    @Resource
+    private IFlowInstanceService FlowInstanceService;
+
     /**
      * 创建业务单
      * @param req
@@ -48,10 +53,21 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
         BeanUtil.copyProperties(req,busForm);
         OrderNum orderNum = stocktakeService.setOrderCode(req.getBussinessType(), req.getOrgId());
         String codeValue=String.format("%04d",orderNum.getNum());
-        busForm.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
+        busForm.setBussinessCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
                 LocalDateTime.now().getMonth().getValue()+"-"+LocalDateTime.now().getDayOfMonth()+"-"+codeValue);
         busForm.setCreateTime(DateTimeUtil.getCurrentDateTime());
         save(busForm);
+        //执行工作流
+        if (req.getExamineState().equals("working"))
+        {
+            StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+            startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+            startProcessInstanceDTO.setOrderId(busForm.getId());
+            startProcessInstanceDTO.setOrderType("workOrder");
+            startProcessInstanceDTO.setUserId(req.getUserId());
+            String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
+            busForm.setProcessId(ProcessInstanceId);
+        }
         return busForm.getId();
     }
 
@@ -87,8 +103,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             req.setOrder(req.getOrder().toLowerCase());
         }
         LambdaQueryWrapper<BusForm> eq = new LambdaQueryWrapper<BusForm>()
+                //单据类型
                 .eq(ObjectUtil.isNotNull(req.getBussinessType()), BusForm::getBussinessType, req.getBussinessType())
+                //审核状态
                 .eq(ObjectUtil.isNotNull(req.getExamineState()), BusForm::getExamineState, req.getExamineState())
+                //
                 .eq(ObjectUtil.isNotNull(req.getWarehouseId()), BusForm::getWarehouseId, req.getWarehouseId())
                 .eq(ObjectUtil.isNotNull(req.getOrgId()),BusForm::getOrgId,req.getOrgId())
                 .ge(ObjectUtil.isNotNull(req.getStartTime()), BusForm::getCreateTime, req.getStartTime())

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -611,4 +611,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return updateBatchById(policemanList);
     }
 
+    @Override
+    public String PoliceReassignment() {
+        return null;
+    }
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ReassignmentServiceImpl.java

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.Reassignment;
+import com.junmp.jyzb.service.ReassignmentService;
+import com.junmp.jyzb.mapper.ReassignmentMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【bussiness_reassignment(警员调岗申请单)】的数据库操作Service实现
+* @createDate 2023-10-07 16:49:31
+*/
+@Service
+public class ReassignmentServiceImpl extends ServiceImpl<ReassignmentMapper, Reassignment>
+    implements ReassignmentService{
+
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/StocktakeServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
+import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.StocktakeDto;
 import com.junmp.jyzb.api.bean.query.StocktakeReq;
 import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
@@ -43,6 +45,9 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
     @Resource
     private OrderNumService orderNumService;
 
+    @Resource
+    private IFlowInstanceService FlowInstanceService;
+
     //盘库申请
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -54,25 +59,20 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
         String codeValue=String.format("%04d",orderNum.getNum());
         stocktake.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
                 LocalDateTime.now().getMonth().getValue()+"-"+LocalDateTime.now().getDayOfMonth()+"-"+codeValue);
-        //如果盘库类型为1：根据货架进行盘点，判断参数排列行是否进行传递，如果传递则需要进行一个参数拼接
-        String shelfLocation="";
-        if (ObjectUtil.isNotNull(req.getShelfRanges()) && !req.getShelfRanges().toString().trim().isEmpty()) {
-            shelfLocation += req.getShelfRanges()+"/";
-            stocktake.setShelfLocation(shelfLocation);
-        }
-
-        if (ObjectUtil.isNotNull(req.getShelfColumns()) && !req.getShelfColumns().toString().trim().isEmpty()) {
-            shelfLocation += req.getShelfColumns()+"/";
-            stocktake.setShelfLocation(shelfLocation);
-        }
-
-        if (ObjectUtil.isNotNull(req.getShelfRows())  && !req.getShelfRows().toString().trim().isEmpty()) {
-            shelfLocation += req.getShelfRows();
-            stocktake.setShelfLocation(shelfLocation);
-        }
         stocktake.setCreateTime(DateTimeUtil.getCurrentDateTime());
         stocktake.setApplyTime(DateTimeUtil.getCurrentDateTime());
         this.save(stocktake);
+        //执行工作流
+        if (req.getExamineState().equals("working"))
+        {
+            StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+            startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+            startProcessInstanceDTO.setOrderId(stocktake.getId());
+            startProcessInstanceDTO.setOrderType("workOrder");
+            startProcessInstanceDTO.setUserId(req.getUserId());
+            String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
+            stocktake.setProcessId(ProcessInstanceId);
+        }
         return stocktake.getId();
     }
 
@@ -120,7 +120,6 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
     public OrderNum setOrderCode(String bussinessType,Long orgId){
         //设置采购单号，需要先判断该组织机构的采购单号是否存在，如果存在则将数量进行增加，如果不存在则新增一条对应的数据
         OrderNum orderNum = new OrderNum();
-        //获取年,月，日，获取组织机构id，获取业务类型
         orderNum.setYear(LocalDateTime.now().getYear());
         orderNum.setBussinessType(bussinessType);
         orderNum.setOrgId(orgId);

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

@@ -12,7 +12,7 @@ public class UpdateSummaryAction implements JobAction {
     @Resource
     private InventoryService inventoryService;
     public void action(){
-        inventoryService.setInventoryMsg();
+//        inventoryService.setInventoryMsg();
     }
 
 }

jyzb-biz/src/main/resources/mapper/ReassignmentMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.junmp.jyzb.mapper.ReassignmentMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Reassignment">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="processId" column="process_id" jdbcType="VARCHAR"/>
+            <result property="policeId" column="police_id" jdbcType="VARCHAR"/>
+            <result property="policeName" column="police_name" jdbcType="VARCHAR"/>
+            <result property="eqsList" column="eqs_list" jdbcType="VARCHAR"/>
+            <result property="orgId" column="org_id" jdbcType="BIGINT"/>
+            <result property="targetOrgId" column="target_org_id" jdbcType="BIGINT"/>
+            <result property="note" column="note" jdbcType="VARCHAR"/>
+            <result property="examineState" column="examine_state" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,process_id,police_id,
+        police_name,eqs_list,org_id,
+        target_org_id,note,examine_state,
+        create_time,update_time,create_user,
+        update_user
+    </sql>
+</mapper>

jyzb-boot/src/main/resources/application-local.yml

@@ -26,9 +26,9 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.3.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
-    username: junmp
-    password: 123456
+    url: jdbc:mysql://127.0.0.1:3306/junmp?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    username: root
+    password: vkeline
 
   redis:
     #host: 192.168.3.188

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

@@ -285,6 +285,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
     @Override
     public Boolean suspendOrActivateProcessDefinitionById(SuspendOrActivateDefinitionReq req) {
         ProcessTemplates processTemplates = processTemplateService.getById(req.getFormId());
+        ProcessTemplates processTemplates = processTemplateService.getById(req.getProcessDefinitionId());
         if (req.getIsStop() == true){
             repositoryService.suspendProcessDefinitionById(req.getProcessDefinitionId(), true, null);
             processTemplates.setIsStop(true);