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

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

@@ -34,7 +34,7 @@ public class UpdatePoliceFingerReq extends BaseRequest {
     /**
      * 指纹信息
      */
-    @NotBlank(message = "指纹信息不能为空",groups = {add.class, edit.class,detail.class})
+    @NotBlank(message = "指纹信息不能为空",groups = {add.class, edit.class})
     @ApiModelProperty(value = "指纹信息")
     private String fingerInfo;
 
@@ -53,7 +53,6 @@ public class UpdatePoliceFingerReq extends BaseRequest {
     /**
      * 指纹编号
      */
-    @NotBlank(message = "指纹编号不能为空",groups = {detail.class})
     private String fingerNum;
 
     private List<UpdatePoliceFingerReq> fingerList;

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

@@ -30,33 +30,33 @@ public class StocktakeController {
     private StocktakeService stocktakeService;
 
     //盘库申请
-    @PostMapping("/AddStocktakeOrder")
-    @ApiOperation("盘库申请")
-    public ApiRes<String> AddStocktakeOrder (@RequestBody @Validated(ValidationApi.add.class) UpdateStocktakeReq req){
-        //判断是否有工作流id，如果有则将状态进行修改
-        if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
-        {
-            req.setExamineState("none");
-        }
-        else
-        {
-            req.setExamineState("working");
-        }
-        return ApiRes.success(stocktakeService.AddStocktakeOrder(req));
-    }
-
-    //查询单据
-    @PostMapping("/ShowStocktakeOrderPage")
-    @ApiOperation("盘库单据查询")
-    public ApiRes<PageResult<Stocktake>> ShowStocktakeOrderPage(@RequestBody @Validated(ValidationApi.edit.class)StocktakeReq req){
-        return ApiRes.success(stocktakeService.ShowStocktakeOrderPage(req));
-    }
-
-    //修改单据
-    @PostMapping("/UpdateStocktakeOrder")
-    @ApiOperation("修改盘库业务单")
-    public ApiRes<Boolean> UpdateStocktakeOrder(@RequestBody @Validated(ValidationApi.edit.class) UpdateStocktakeReq req) {
-        return ApiRes.success(stocktakeService.UpdateStocktakeOrder(req));
-    }
+//    @PostMapping("/AddStocktakeOrder")
+//    @ApiOperation("盘库申请")
+//    public ApiRes<String> AddStocktakeOrder (@RequestBody @Validated(ValidationApi.add.class) UpdateStocktakeReq req){
+//        //判断是否有工作流id，如果有则将状态进行修改
+//        if (ObjectUtil.isEmpty(req.getProcessDefinitionId()))
+//        {
+//            req.setExamineState("none");
+//        }
+//        else
+//        {
+//            req.setExamineState("working");
+//        }
+//        return ApiRes.success(stocktakeService.AddStocktakeOrder(req));
+//    }
+//
+//    //查询单据
+//    @PostMapping("/ShowStocktakeOrderPage")
+//    @ApiOperation("盘库单据查询")
+//    public ApiRes<PageResult<Stocktake>> ShowStocktakeOrderPage(@RequestBody @Validated(ValidationApi.edit.class)StocktakeReq req){
+//        return ApiRes.success(stocktakeService.ShowStocktakeOrderPage(req));
+//    }
+//
+//    //修改单据
+//    @PostMapping("/UpdateStocktakeOrder")
+//    @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/service/impl/BusFormServiceImpl.java

@@ -185,7 +185,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             //装备列表
             startProcessInstanceDTO.setInvList(req.getInvList());
             //业务类型
-            startProcessInstanceDTO.setBussinessType(req.getBussinessType());
+            startProcessInstanceDTO.setType("busFormDto");
 
             Object A= JSON.toJSONString(req);
             JSONObject jsonObject = JSON.parseObject(A.toString());

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

@@ -109,6 +109,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
                 startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
                 startProcessInstanceDTO.setOrderId(BI.getId());
                 startProcessInstanceDTO.setOrderType("stocktakeOrder");
+                startProcessInstanceDTO.setType("stocktakeDto");
                 String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
                 BI.setProcessId(ProcessInstanceId);
 

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

@@ -484,7 +484,6 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         if (ObjectUtil.isNotEmpty(req.getSizeNames()) && req.getSizeNames().size()>0) {
             wrapper.and(qw -> req.getSizeNames().forEach(sizeName -> qw.or().eq(InventorySummary::getSizeName, sizeName)));
         }
-//        wrapper.groupBy()
         if (ObjectUtil.isNotEmpty(req.getColumn())&&!req.getColumn().equals("create_time"))
         {
             wrapper.last("order by " + req.getColumn() + " " + req.getOrder());

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

@@ -112,7 +112,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     private BusFormService busFormService;
 
     @Resource
-    private StocktakeService stocktakeService;
+    private BussinessInventoryService bussinessInventoryService;
 
     @Resource
     private ReassignmentService reassignmentService;
@@ -325,6 +325,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //装备列表
         startProcessInstanceDTO.setInvList(req.getInvList());
         startProcessInstanceDTO.setOutInState(req.getOrderType());
+        startProcessInstanceDTO.setType("orderDto");
 
         if (req.getOrderType().equals("in")){
             //发物单位和收物单位
@@ -1299,7 +1300,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         }
 
         ProcessOrderDto processOrderDto = new ProcessOrderDto();
-        System.out.println("req = " + req.getOrderType());
         if (req.getOrderType().equals("null")|| ObjectUtil.isNull(req.getOrderType())) {
             return processOrderDto;
         }
@@ -1343,11 +1343,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             BeanPlusUtil.copyProperties(one,busFormDto);
             processOrderDto.setBusFormDto(busFormDto);
         } else if (req.getOrderType().equals("stacktakeOrder")) {
-            StocktakeDto stocktakeDto = new StocktakeDto();
-            Stocktake one = stocktakeService.getOne(new LambdaQueryWrapper<Stocktake>()
-                    .eq(Stocktake::getProcessId, req.getProcessId()));
-            BeanPlusUtil.copyProperties(one,stocktakeDto);
-            processOrderDto.setStocktakeDto(stocktakeDto);
+            BussinessInventoryDto bussinessInventoryDto = new BussinessInventoryDto();
+            BussinessInventory one = bussinessInventoryService.getOne(new LambdaQueryWrapper<BussinessInventory>()
+                    .eq(BussinessInventory::getProcessId, req.getProcessId()));
+
         } else if (req.getOrderType().equals("reassigment")) {
             ReassignmentDto reassignmentDto = new ReassignmentDto();
             Reassignment one = reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()

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

@@ -1094,7 +1094,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             startProcessInstanceDTO.setOrderId(reassignment.getId());
             startProcessInstanceDTO.setOrderType("reassignment");
             startProcessInstanceDTO.setUserId(req.getUserId());
-            startProcessInstanceDTO.setBussinessType(req.getBussinessType());
+            startProcessInstanceDTO.setType("reassignmentDto");
             startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             reassignment.setProcessId(ProcessInstanceId);

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

@@ -536,7 +536,7 @@
             base_inventory_summary `is`
             join base_equipment_type et on is.type_id=et.id
             WHERE
-            is.org_id_int = #{req.oegId}
+            is.org_id_int = #{req.orgId}
             <if test="req.typeIds !=null and req.typeIds.size()>0">
                 and (
                 <foreach collection="req.typeIds" item="item" open="(" separator="or" close=")">
@@ -544,6 +544,9 @@
                 </foreach>
                 )
             </if>
+            <if test="req.locationType !='all' and req.locationType != null ">
+                and is.location_type=#{req.locationType}
+            </if>
             GROUP BY
             is.type_id,
             is.type_name
@@ -571,7 +574,7 @@
         base_inventory_summary `is`
         join base_equipment_type et on is.type_id=et.id
         WHERE
-        is.org_id_int = #{req.oegId}
+        is.org_id_int = #{req.orgId}
         <if test="req.typeIds !=null and req.typeIds.size()>0">
           and (
               <foreach collection="req.typeIds" item="item" open="(" separator="or" close=")">
@@ -579,16 +582,16 @@
               </foreach>
             )
         </if>
-        <if test="req.locationType!= null or req.locationType !=''">
+        <if test="req.locationType !='all' and req.locationType != null">
             and is.location_type=#{req.locationType}
         </if>
         GROUP BY
         is.type_id,
         is.type_name
-        <if test="req.column != create_time ">
+        <if test="req.column != 'create_time' ">
             order by ${req.column} ${req.order}
         </if>
-        <if test="req.column == create_time ">
+        <if test="req.column == 'create_time' ">
             order by is.type_id asc
         </if>
         <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
@@ -597,7 +600,46 @@
     </select>
     <select id="GetEquipmentSummaryDetail" resultType="com.junmp.jyzb.entity.InventorySummary"
             parameterType="com.junmp.jyzb.api.bean.query.InventorySumReq">
-
+        SELECT
+        is.type_id,
+        is.type_name,
+        is.size_id,
+        is.size_name,
+        sum( is.number ) AS number,
+        sum( is.number * is.unit_price ) AS price,
+        sum( is.stock_number ) AS stock_number,
+        sum( is.stock_number * is.unit_price ) AS stock_number_price,
+        sum( is.outbound_number ) AS outbound_number,
+        sum( is.outbound_number * is.unit_price ) AS outbound_number_price,
+        sum( is.destruction_number ) AS destruction_number,
+        sum( is.destruction_number * is.unit_price ) AS destruction_number_price ,
+        sum( is.expire_number) as expire_number,
+        sum( is.expire_number * is.unit_price ) AS expire_number_price ,
+        sum( is.broken_number) as broken_number,
+        sum( is.broken_number * is.unit_price ) AS broken_number_price
+        FROM
+        base_inventory_summary `is`
+        join base_equipment_type et on is.type_id=et.id
+        WHERE
+        is.org_id_int = #{req.orgId}
+        <if test="req.typeIds !=null and req.typeIds.size()>0">
+            and (
+            <foreach collection="req.typeIds" item="item" open="(" separator="or" close=")">
+                et.id=#{item} or et.parent_ids like CONCAT('%', #{item}, '%')
+            </foreach>
+            )
+        </if>
+        <if test="req.locationType !='all' and req.locationType != null">
+            and is.location_type=#{req.locationType}
+        </if>
+        GROUP BY
+        is.type_id,
+        is.type_name,
+        is.size_id,
+        is.size_name
+        <if test="req.column != null and req.column != '' and req.order != null and req.order != '' ">
+            order by ${req.column} ${req.order}
+        </if>
     </select>
 
 </mapper>
\ No newline at end of file

jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java

@@ -19,6 +19,7 @@ public interface CommonConstants {
     String END_ORG_NAME="endOrgName";//收物单位
     String INVLIST="invList";//装备列表拼接
     String BUSSINESS_TYPE="bussinessType"; //单据业务类型
+    String TYPE="type"; //单据业务类型
     String OUT_IN_STATE="outInState";//出入库单据状态（出库还是入库）
     String PROCESS_ID="processId";
 

jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java

@@ -29,8 +29,8 @@ public class StartProcessInstanceDTO {
     //装备列表拼接
     private String invList;
 
-    //单据业务类型
-    private String bussinessType;
+    //单据类型
+    private String type;
     //出入库单据状态（出库还是入库）
     private String outInState;
 

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

@@ -153,7 +153,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
             processVariables.put(INVLIST,processInstanceDto.getInvList());
         }
         //单据类型
-        processVariables.put(BUSSINESS_TYPE,processInstanceDto.getBussinessType());
+        processVariables.put(TYPE,processInstanceDto.getType());
         //出入库状态
         if (ObjectUtil.isNotNull(processInstanceDto.getOutInState())){
             processVariables.put(OUT_IN_STATE,processInstanceDto.getOutInState());

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

@@ -777,6 +777,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         vo.setDetailJson(JSON.parseObject(detailJson));
         //设置类型
         vo.setType(MapUtil.getStr(historicProcessInstance.getProcessVariables(),BUSSINESS_TYPE));
+
         Map<String, List<Comment>> commentsMap = processInstanceComments.stream()
                 .collect(Collectors.groupingBy(Comment::getTaskId, Collectors.toList()));
         List<Attachment> processInstanceAttachments = taskService.getProcessInstanceAttachments(processInstanceId);