问题调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilertaskorderitemreport/BoilerTaskOrderItemReportDO.java

@@ -356,4 +356,13 @@ public class BoilerTaskOrderItemReportDO extends BaseDO {
      * 费用类型（1=法定，2=服务）
      */
     private String feeType;
+    /**
+     * 记录校核提交人
+     */
+    private String recheckSubmitId;
+    /**
+     * 记录校核提交时间
+     */
+    private LocalDateTime recheckSubmitTime;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorderitemreport/PipeTaskOrderItemReportDO.java

@@ -352,4 +352,13 @@ public class PipeTaskOrderItemReportDO extends BaseDO {
      * 费用类型（1=法定，2=服务）
      */
     private String feeType;
+    /**
+     * 记录校核提交人
+     */
+    private String recheckSubmitId;
+    /**
+     * 记录校核提交时间
+     */
+    private LocalDateTime recheckSubmitTime;
+
 }

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

@@ -4334,6 +4334,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Override
     public Boolean recheckOrderItem(RecheckOrderItemVO recheckOrderItemVO) {
 
+        String userId = getLoginUserId();
+
         BoilerTaskOrderItemReportDO taskOrderItemReportDO = new BoilerTaskOrderItemReportDO();
         taskOrderItemReportDO.setId(recheckOrderItemVO.getId());
         taskOrderItemReportDO.setRecheckId(recheckOrderItemVO.getRecheckId());
@@ -4353,6 +4355,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         taskOrderItemReportDO.setRecheckStatus(100);
         taskOrderItemReportDO.setTaskStatus(TaskOrderStatusEnum.RECHECK.getStatus());
+        taskOrderItemReportDO.setRecheckSubmitId(userId);
+        taskOrderItemReportDO.setRecheckSubmitTime(LocalDateTime.now());
 
         BoilerTaskOrderItemReportDO oldReport = taskOrderItemReportMapper.selectById(recheckOrderItemVO.getId());
         if (oldReport.getReportType() != null && oldReport.getReportType() == 400) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictb/DynamicTbServiceImpl.java

@@ -89,6 +89,8 @@ public class DynamicTbServiceImpl extends ServiceImpl<DynamicTbMapper, DynamicTb
     public void updateDynamicTb(DynamicTbSaveReqVO updateReqVO) {
         // 校验存在
         validateDynamicTbExists(updateReqVO.getId());
+        // 校验tbCode唯一性
+        validateTbCodeUnique(updateReqVO.getTbCode());
         // 更新
         DynamicTbDO updateObj = BeanUtils.toBean(updateReqVO, DynamicTbDO.class);
         dynamicTbMapper.updateById(updateObj);

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

@@ -3302,6 +3302,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     @Override
     public Boolean recheckOrderItem(RecheckOrderItemVO recheckOrderItemVO) {
 
+        String userId = getLoginUserId();
+
         PipeTaskOrderItemReportDO taskOrderItemReportDO = new PipeTaskOrderItemReportDO();
         taskOrderItemReportDO.setId(recheckOrderItemVO.getId());
         taskOrderItemReportDO.setRecheckId(recheckOrderItemVO.getRecheckId());
@@ -3321,6 +3323,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         taskOrderItemReportDO.setRecheckStatus(100);
         taskOrderItemReportDO.setTaskStatus(TaskOrderStatusEnum.RECHECK.getStatus());
+        taskOrderItemReportDO.setRecheckSubmitId(userId);
+        taskOrderItemReportDO.setRecheckSubmitTime(LocalDateTime.now());
 
         PipeTaskOrderItemReportDO oldReport = taskOrderItemReportMapper.selectById(recheckOrderItemVO.getId());
         if (oldReport.getReportType() != null && oldReport.getReportType() == 400) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -150,7 +150,7 @@
         select rownum,a.* from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,
@@ -239,7 +239,7 @@
         select count(1) from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemMapper.xml

@@ -144,7 +144,7 @@
         select rownum,a.* from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,
@@ -238,7 +238,7 @@
         select count(*) from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,