Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1929,6 +1929,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Resource
     private PushTaskOrderService pushTaskOrderService;
 
+    @Value("${tz.env.name}")
+    private String env;
+
     @Transactional
     @Override
     public Boolean audit(String id, Integer status, String reason) {
@@ -2016,7 +2019,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             BoilerTaskOrderItemDO taskOrderItem = new BoilerTaskOrderItemDO();
             taskOrderItem.setTaskStatus(TaskOrderStatusEnum.CANCEL.getStatus());
             boilerTaskOrderItemMapper.update(taskOrderItem, new LambdaUpdateWrapper<BoilerTaskOrderItemDO>().eq(BoilerTaskOrderItemDO::getOrderId, id));
-//            pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+            if (EnvEnum.UAT.getEnvName().equals(env)) {
+                pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+            }
         }
 
         return true;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderissuereport/BoilerTaskOrderIssueReportServiceImpl.java

@@ -85,6 +85,7 @@ import cn.start.tz.module.pressure2.service.member.vo.MemberUserRespVO;
 import cn.start.tz.module.pressure2.service.membermessage.MemberMessageRemoteService;
 import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
 import cn.start.tz.module.pressure2.service.pdf.PdfService;
+import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
 import cn.start.tz.module.pressure2.util.JwApiClient;
 import cn.start.tz.module.pressure2.util.vo.ApiResponse;
 import cn.start.tz.module.pressure2.util.vo.ReportRequest;
@@ -278,6 +279,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
     @Resource
     private FileApi fileApi;
 
+    @Resource
+    private PushTaskOrderService pushTaskOrderService;
+
     @Override
     public String createBoilerTaskOrderIssueReport(BoilerTaskOrderIssueReportSaveReqVO createReqVO) {
         // 插入
@@ -867,6 +871,10 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                 });
             }
         });
+        // 推送结算系统
+        if (env.equals("uat")){
+            pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+        }
     }
 
     @Override
@@ -1519,6 +1527,10 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
                         }
                     });
                 }
+                // 推送结算系统
+                if (env.equals("uat")){
+                    pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+                }
 
             });
 

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

@@ -12,6 +12,7 @@ import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.common.util.date.DateUtils;
 import cn.start.tz.framework.common.util.object.BeanUtils;
+import cn.start.tz.framework.env.core.enums.EnvEnum;
 import cn.start.tz.framework.ip.core.Area;
 import cn.start.tz.framework.ip.core.utils.AreaUtils;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -151,6 +152,7 @@ import cn.start.tz.module.pressure2.service.pipetaskorderissuereport.PipeTaskOrd
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportversion.PipeTaskOrderItemReportVersionService;
 import cn.start.tz.module.pressure2.service.pipetaskorderoperation.PipeTaskOrderOperationService;
 import cn.start.tz.module.pressure2.service.pipetaskordersecuritycheck.PipeTaskOrderSecurityCheckService;
+import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
 import cn.start.tz.module.pressure2.service.userwallthicknesstemplate.UserWallThicknessTemplateService;
 import cn.start.tz.module.pressure2.util.ConversionUtil;
 import cn.start.tz.module.pressure2.util.DeptDataPermissionUtil;
@@ -186,6 +188,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -1591,6 +1594,12 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         }
     }
 
+    @Resource
+    private PushTaskOrderService pushTaskOrderService;
+
+    @Value("${tz.env.name}")
+    private String env;
+
     @Override
     @Transactional
     public Boolean audit(String id, Integer status, String reason) {
@@ -1679,6 +1688,10 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             PipeTaskOrderItemDO taskOrderItem = new PipeTaskOrderItemDO();
             taskOrderItem.setTaskStatus(TaskOrderStatusEnum.CANCEL.getStatus());
             pipeTaskOrderItemMapper.update(taskOrderItem, new LambdaUpdateWrapper<PipeTaskOrderItemDO>().eq(PipeTaskOrderItemDO::getOrderId, id));
+
+            if (EnvEnum.UAT.getEnvName().equals(env)) {
+                pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+            }
         }
 
         return true;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderissuereport/PipeTaskOrderIssueReportServiceImpl.java

@@ -88,6 +88,7 @@ import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportrecord.PipeTaskOrderItemReportRecordService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemreportversion.PipeTaskOrderItemReportVersionService;
+import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
 import cn.start.tz.module.pressure2.util.JwApiClient;
 import cn.start.tz.module.pressure2.util.vo.ApiResponse;
 import cn.start.tz.module.pressure2.util.vo.ReportRequest;
@@ -272,6 +273,9 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
     @Resource
     private FileApi fileApi;
 
+    @Resource
+    private PushTaskOrderService pushTaskOrderService;
+
     @Override
     public String createPipeTaskOrderIssueReport(PipeTaskOrderIssueReportSaveReqVO createReqVO) {
         // 插入
@@ -813,6 +817,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                 });
             }
         });
+        // 推送结算系统
+        if (env.equals("uat")){
+            pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+        }
     }
     @Override
     public PageResult<TaskOrderIssueReportItemRespVO> getTaskOrderIssueReportEquipPageApp(TaskOrderIssueReportPageReqVO pageReqVO) {
@@ -1493,6 +1501,10 @@ public class PipeTaskOrderIssueReportServiceImpl extends ServiceImpl<PipeTaskOrd
                         }
                     });
                 }
+                // 推送结算系统
+                if (env.equals("uat")){
+                    pushTaskOrderService.pushFinanceSystem(taskOrderDO);
+                }
 
             });