检验意见签名填充

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerAppTaskOrderItemReportServiceImpl.java

@@ -9,14 +9,18 @@ import cn.start.tz.framework.security.core.util.SecurityFrameworkUtils;
 import cn.start.tz.framework.security.core.LoginUser;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerOrderItemPageRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportSignReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorderitemreport.vo.BoilerTaskOrderItemReportSignRespVO;
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.controller.app.taskorderitemreport.vo.InspectionOpinionUploadReqVo;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.framework.appauth.core.context.AppAuthContextHolder;
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
+import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +56,9 @@ public class BoilerAppTaskOrderItemReportServiceImpl implements BoilerAppTaskOrd
     @Resource
     private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
 
+    @Resource
+    private DynamicTbInsService dynamicTbInsService;
+
     @Resource
     private RedissonClient redissonClient;
 
@@ -120,6 +127,13 @@ public class BoilerAppTaskOrderItemReportServiceImpl implements BoilerAppTaskOrd
                 updateWrapper.set(BoilerTaskOrderItemReportDO::getRectificationStatus, 2);
             }
             boilerTaskOrderItemReportMapper.update(updateWrapper);
+            // 签名完更新
+            if (Integer.valueOf(0).equals(reqVo.getBusinessType())) {
+                BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
+                syncReportVO.setRefId(reportDO.getId());
+                syncReportVO.setReportType("record");
+                boilerTaskOrderService.syncReportData(syncReportVO);
+            }
         } catch (Exception e) {
             throw exception(new ErrorCode(10071, "检验意见通知书整改-执行失败：" + e.getMessage()));
         } finally {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersignfile/BoilerTaskOrderSignFileService.java

@@ -64,6 +64,8 @@ public interface BoilerTaskOrderSignFileService extends IService<BoilerTaskOrder
 
     BoilerTaskOrderSignFileDO selectLastOneByOrderIdAndBusinessType(String orderId, Integer businessType);
 
+    List<BoilerTaskOrderSignFileDO> selectByOrderIdAndBusinessType(String orderId, Integer businessType);
+
     PageResult<BoilerTaskOrderSignFileRespVO> getTaskOrderSignFilePage(BoilerTaskOrderSignFilePageReqVO pageReqVO);
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskordersignfile/BoilerTaskOrderSignFileServiceImpl.java

@@ -12,7 +12,6 @@ import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorder.PipeTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -120,6 +119,16 @@ public class BoilerTaskOrderSignFileServiceImpl extends ServiceImpl<BoilerTaskOr
         lambdaQueryWrapperX.last("limit 1");
         return boilerTaskOrderSignFileMapper.selectOne(lambdaQueryWrapperX);
 
+    }
+    @Override
+    public List<BoilerTaskOrderSignFileDO> selectByOrderIdAndBusinessType(String orderId, Integer businessType) {
+
+        LambdaQueryWrapperX<BoilerTaskOrderSignFileDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        lambdaQueryWrapperX.eqIfPresent(BoilerTaskOrderSignFileDO::getOrderId, orderId);
+        lambdaQueryWrapperX.eqIfPresent(BoilerTaskOrderSignFileDO::getBusinessType, businessType);
+        lambdaQueryWrapperX.orderByDesc(BoilerTaskOrderSignFileDO::getCreateTime);
+        return boilerTaskOrderSignFileMapper.selectList(lambdaQueryWrapperX);
+
     }
 
     @Override

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

@@ -25,6 +25,7 @@ import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
@@ -101,13 +102,9 @@ public class QC01006_202400OFData implements IDynamicOFData {
             if (itemReportDO != null){
                 // 填充签名
                 BoilerTaskOrderDO taskOrderDO = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getId, itemReportDO.getOrderId()));
-                if (taskOrderDO != null){
-                    BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(taskOrderDO.getId(), 400);
-                    if (boilerTaskOrderSignFileDO != null){
-                        result.put("checkUnit", boilerTaskOrderSignFileDO.getSignUrl());
-                    }
-                }
-                result.put("checkName",itemReportDO.getSignUrl());
+                result.put("checkUnit", itemReportDO.getSignUrl());
+                AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
+                result.put("checkName", checkedData.getSignUrl());
 
                 String orderItemId = itemReportDO.getOrderItemId();
                 BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);

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

@@ -106,13 +106,13 @@ public class QC01007_202400OFData implements IDynamicOFData {
             if (itemReportDO != null){
                 // 填充签名
                 BoilerTaskOrderDO taskOrderDO = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getId, itemReportDO.getOrderId()));
-                if (taskOrderDO != null){
-                    BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = boilerTaskOrderSignFileService.selectLastOneByOrderIdAndBusinessType(taskOrderDO.getId(), 400);
-                    if (boilerTaskOrderSignFileDO != null){
-                        result.put("checkUnit", boilerTaskOrderSignFileDO.getSignUrl());
-                    }
+                String signUrl = itemReportDO.getSignUrl();
+                if (signUrl.contains(",")){
+                    result.put("checkUnit", signUrl.split(",")[0]);
+                    result.put("checkUnitPerson", signUrl.split(",")[1]);
                 }
-                result.put("checkName",itemReportDO.getSignUrl());
+                AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
+                result.put("checkName",checkedData.getSignUrl());
                 if (taskOrderDO != null){
                     result.put("checkDate",taskOrderDO.getCheckDate());
                 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeAppTaskOrderItemReportServiceImpl.java

@@ -8,6 +8,7 @@ import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.framework.security.core.util.SecurityFrameworkUtils;
 import cn.start.tz.framework.security.core.LoginUser;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignReqVO;
@@ -119,6 +120,13 @@ public class PipeAppTaskOrderItemReportServiceImpl implements PipeAppTaskOrderIt
                 updateWrapper.set(PipeTaskOrderItemReportDO::getRectificationStatus, 2);
             }
             pipeTaskOrderItemReportMapper.update(updateWrapper);
+            // 签名完更新
+            if (Integer.valueOf(0).equals(reqVo.getBusinessType())) {
+                BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
+                syncReportVO.setRefId(reportDO.getId());
+                syncReportVO.setReportType("record");
+                pipeTaskOrderService.syncReportData(syncReportVO);
+            }
         } catch (Exception e) {
             throw new RuntimeException("检验意见通知书整改-执行失败：" + e.getMessage());
         } finally {