调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/appointmentconfirmrefuseyearitem/AppointmentConfirmRefuseYearItemMapper.java

@@ -97,6 +97,7 @@ public interface AppointmentConfirmRefuseYearItemMapper extends BaseMapperX<Appo
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipType, reqVO.getEquipType())
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipMainType, reqVO.getEquipMainType())
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getCheckTypeName, reqVO.getCheckTypeName())
+                .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipDistrict, reqVO.getEquipDistrict())
                 .eqIfPresent(AppointmentConfirmRefuseYearItemDO::getEquipStatusName, reqVO.getEquipStatusName())
                 .orderByDesc(AppointmentConfirmRefuseYearItemDO::getCreateTime);
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/appointmentconfirmorder/PipeAppointmentConfirmOrderServiceImpl.java

@@ -740,25 +740,28 @@ public class PipeAppointmentConfirmOrderServiceImpl implements PipeAppointmentCo
         appointmentConfirmOrderRefuseItemMapper.insertBatch(list);
         list.forEach(item -> {
 
-            String processKey = BoilerBpmModelConstants.REPORT_CITY_BUREAU_BOILER;
-            if (item.getEquipMainType() == 200){
-                processKey = BoilerBpmModelConstants.REPORT_CITY_BUREAU_BOILER;
-            }else if (item.getEquipMainType() == 300){
-                processKey = PipeBpmModelConstants.REPORT_CITY_BUREAU_PIPE;
-            }
-
-            String processInstanceId = processInstanceApi.createProcessInstance(userId,
-                    new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(processKey)
-                            .setVariables(processInstanceVariables).setBusinessKey(item.getId())).getCheckedData();
+            //定检自动提交审核
+            if (item.getCheckType() == 100){
+                String processKey = BoilerBpmModelConstants.REPORT_CITY_BUREAU_BOILER;
+                if (item.getEquipMainType() == 200){
+                    processKey = BoilerBpmModelConstants.REPORT_CITY_BUREAU_BOILER;
+                }else if (item.getEquipMainType() == 300){
+                    processKey = PipeBpmModelConstants.REPORT_CITY_BUREAU_PIPE;
+                }
 
-            AppointmentConfirmOrderRefuseItemDO updateObj = new AppointmentConfirmOrderRefuseItemDO();
-            updateObj.setId(item.getId());
-            updateObj.setProcessInstanceId(processInstanceId);
-            updateObj.setIsSubmit(true);
-            updateObj.setStatus(100);
-            updateObj.setSubmitId(getLoginUserId());
-            updateObj.setSubmitTime(LocalDateTime.now());
-            appointmentConfirmOrderRefuseItemMapper.updateById(updateObj);
+                String processInstanceId = processInstanceApi.createProcessInstance(userId,
+                        new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(processKey)
+                                .setVariables(processInstanceVariables).setBusinessKey(item.getId())).getCheckedData();
+
+                AppointmentConfirmOrderRefuseItemDO updateObj = new AppointmentConfirmOrderRefuseItemDO();
+                updateObj.setId(item.getId());
+                updateObj.setProcessInstanceId(processInstanceId);
+                updateObj.setIsSubmit(true);
+                updateObj.setStatus(100);
+                updateObj.setSubmitId(getLoginUserId());
+                updateObj.setSubmitTime(LocalDateTime.now());
+                appointmentConfirmOrderRefuseItemMapper.updateById(updateObj);
+            }
         });
 
         //修改约检确认单