问题调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderitemreport/BoilerTaskOrderItemReportMapper.java

@@ -138,7 +138,7 @@ public interface BoilerTaskOrderItemReportMapper extends BaseMapperX<BoilerTaskO
             recordDOMPJLambdaWrapper.eq(BoilerTaskOrderItemReportDO::getReportType, reqVO.getReportType());
             recordDOMPJLambdaWrapper.ge(BoilerTaskOrderItemReportDO::getStatus, BpmTaskStatusEnum.RUNNING.getStatus());
         }else{
-            recordDOMPJLambdaWrapper.in(BoilerTaskOrderItemReportDO::getReportType, Arrays.asList(500,700));
+            recordDOMPJLambdaWrapper.in(BoilerTaskOrderItemReportDO::getReportType, Arrays.asList(500,600,700));
         }
 
         if (!CollUtil.isEmpty(reqVO.getCheckDate()) && reqVO.getCheckDate().size() == 2) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -35,6 +35,7 @@ import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.dataobject.businessmemberrelation.BusinessMemberRelationDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderuser.PipeTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnectrecordreport.BoilerConnectRecordReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.businessmemberrelation.BusinessMemberRelationMapper;
@@ -1711,6 +1712,13 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                     }).filter(Objects::nonNull).toList().forEach(item -> {
                         taskOrderItemReportMapper.insert(item);
                         dynamicTbInsService.copyInstantiate(reportDO.getId(), item.getId());
+
+                        //添加提交人
+                        BoilerTaskOrderItemReportUserDO userDO = new BoilerTaskOrderItemReportUserDO();
+                        userDO.setUserId(reportDO.getSubmitId());
+                        userDO.setReportId(item.getId());
+                        boilerTaskOrderItemReportUserMapper.insert(userDO);
+
                     });
                     itemReportDO.setReportNo(reportNo);
                 }
@@ -3735,6 +3743,12 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         addReport.setReportNo(reportNo);
         taskOrderItemReportMapper.insert(addReport);
 
+        //添加提交人
+        BoilerTaskOrderItemReportUserDO userDO = new BoilerTaskOrderItemReportUserDO();
+        userDO.setUserId(getLoginUserId());
+        userDO.setReportId(addReport.getId());
+        boilerTaskOrderItemReportUserMapper.insert(userDO);
+
         //生成 报表数据
         BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
         syncReportVO.setRefId(addReport.getId());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01001_202400OFData.java

@@ -83,7 +83,7 @@ public class QC01001_202400OFData implements IDynamicOFData {
         JSONObject result = new JSONObject();
 
         String makeUint = "";
-        String uintName = "";
+        String unitName = "";
         String equipName = "";
         String productCode = "";
         String projectName = "";
@@ -104,7 +104,7 @@ public class QC01001_202400OFData implements IDynamicOFData {
                         if (equipBoilerDO != null){
                             //设备信息
                             makeUint = (makeUint.isEmpty()?makeUint:makeUint+",") + (StringUtils.isEmpty(equipBoilerDO.getMakeUnit())?"-":equipBoilerDO.getMakeUnit());
-                            uintName = (uintName.isEmpty()?uintName:uintName+",") + (StringUtils.isEmpty(equipBoilerDO.getUnitName())?"-":equipBoilerDO.getUnitName());
+                            unitName = (unitName.isEmpty()?unitName:unitName+",") + (StringUtils.isEmpty(equipBoilerDO.getUnitName())?"-":equipBoilerDO.getUnitName());
                             equipName = (equipName.isEmpty()?equipName:equipName+",") + (StringUtils.isEmpty(equipBoilerDO.getEquipName())?"-":equipBoilerDO.getEquipName());
                             productCode = (productCode.isEmpty()?productCode:productCode+",") + (StringUtils.isEmpty(equipBoilerDO.getProductCode())?"-":equipBoilerDO.getProductCode());
                             unitAddress = (unitAddress.isEmpty()?unitAddress:unitAddress+",") + (StringUtils.isEmpty(equipBoilerDO.getUnitAddress())?"-":equipBoilerDO.getUnitAddress());
@@ -113,7 +113,7 @@ public class QC01001_202400OFData implements IDynamicOFData {
                     }
                     result.put("projectName",projectName.isEmpty()?"-":projectName);
                     result.put("makeUint",makeUint.isEmpty()?"-":makeUint);
-                    result.put("uintName",uintName.isEmpty()?"-":uintName);
+                    result.put("unitName",unitName.isEmpty()?"-":unitName);
                     result.put("equipName",equipName.isEmpty()?"-":equipName);
                     result.put("productCode",productCode.isEmpty()?"-":productCode);
                     result.put("unitAddress",unitAddress.isEmpty()?"-":unitAddress);
@@ -176,7 +176,7 @@ public class QC01001_202400OFData implements IDynamicOFData {
                         if (equipPipeDO != null){
                             //设备信息
                             makeUint = (makeUint.isEmpty()?makeUint:makeUint+",") + (StringUtils.isEmpty(equipPipeDO.getUnitCode())?"-":equipPipeDO.getUnitCode());
-                            uintName = (uintName.isEmpty()?uintName:uintName+",") + (StringUtils.isEmpty(equipPipeDO.getUnitName())?"-":equipPipeDO.getUnitName());
+                            unitName = (unitName.isEmpty()?unitName:unitName+",") + (StringUtils.isEmpty(equipPipeDO.getUnitName())?"-":equipPipeDO.getUnitName());
                             projectName = (projectName.isEmpty()?projectName:projectName+",") + (StringUtils.isEmpty(equipPipeDO.getProjectName())?"-":equipPipeDO.getProjectName());
                             productCode = (productCode.isEmpty()?productCode:productCode+",") + (StringUtils.isEmpty(equipPipeDO.getProjectNo())?"-":equipPipeDO.getProjectNo());
                             unitAddress = (unitAddress.isEmpty()?unitAddress:unitAddress+",") + (StringUtils.isEmpty(equipPipeDO.getUnitAddress())?"-":equipPipeDO.getUnitAddress());
@@ -185,7 +185,7 @@ public class QC01001_202400OFData implements IDynamicOFData {
                     }
                     result.put("projectName",projectName.isEmpty()?"-":projectName);
                     result.put("makeUint",makeUint.isEmpty()?"-":makeUint);
-                    result.put("uintName",uintName.isEmpty()?"-":uintName);
+                    result.put("unitName",unitName.isEmpty()?"-":unitName);
                     result.put("equipName",projectName.isEmpty()?"-":projectName);
                     result.put("productCode",productCode.isEmpty()?"-":productCode);
                     result.put("unitAddress",unitAddress.isEmpty()?"-":unitAddress);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -32,6 +32,7 @@ import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.
 import cn.start.tz.module.pressure2.controller.admin.equipboilerscheduling.vo.BoilerDeleteTask;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.OrderItemReportUpdateVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportuser.BoilerTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.businessmemberrelation.BusinessMemberRelationDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboilerschedulingitem.EquipBoilerSchedulingCheckDO;
@@ -2971,6 +2972,12 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         addReport.setReportNo(reportNo);
         taskOrderItemReportMapper.insert(addReport);
 
+        //添加提交人
+        PipeTaskOrderItemReportUserDO userDO = new PipeTaskOrderItemReportUserDO();
+        userDO.setUserId(getLoginUserId());
+        userDO.setReportId(addReport.getId());
+        pipeTaskOrderItemReportUserMapper.insert(userDO);
+
         //生成 报表数据
         BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
         syncReportVO.setRefId(addReport.getId());