调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10033_202400ReportOFData.java

@@ -28,6 +28,7 @@ import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
@@ -83,6 +84,7 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
 
         //日期格式
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+        DateTimeFormatter dateFormatMonthYear = DateTimeFormatter.ofPattern("yyyy-MM");
 
         //设备报表ID
         String refId = ruleVO.getRefId();
@@ -99,6 +101,10 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
             String orderItemId = itemReportDO.getOrderItemId();
             BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
+
+            String orderId = itemReportDO.getOrderId();
+            BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(orderId);
+
             if (equipBoilerDO != null){
                 //设备信息
                 //只需第一次初始化的数据
@@ -107,12 +113,17 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
                     result.put("pressure",equipBoilerDO.getWorkpressure());
                     result.put("medium",equipBoilerDO.getTestmedium());
                     result.put("temperature",equipBoilerDO.getRatedExportTemperature());
+
+                    //下次检验日期
+                    if (taskOrderDO != null && taskOrderDO.getCheckDate() != null){
+                        LocalDate nextYearCheckDate = taskOrderDO.getCheckDate().plusYears(1).minusDays(1);
+                        result.put("nextOutCheckDate1_monthYear",nextYearCheckDate.format(dateFormatMonthYear));
+                    }
+
                 }
 
             }
 
-            String orderId = itemReportDO.getOrderId();
-            BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(orderId);
             if (taskOrderDO != null){
                 String checkDateStr = taskOrderDO.getCheckDate().format(dateFormat);
                 if (itemDO.getEndCheckDate() != null){

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/AutoDataBoilerService.java

@@ -126,37 +126,39 @@ public class AutoDataBoilerService {
             // 第一次生成时，复用上次已办结的同设备+同检验性质+同报表模板的记录数据
             if (itemDO != null && taskOrderDO != null
                     && itemReportDO.getTemplateId() != null) {
-                BoilerTaskOrderItemReportDO lastCompletedReport = boilerTaskOrderItemReportMapper
-                        .selectLastCompletedByTemplate(itemDO.getEquipId(),
-                                taskOrderDO.getCheckType(),
-                                itemReportDO.getTemplateId(),
-                                boilerTaskOrderItemReportDOId);
-                if (lastCompletedReport != null) {
+
+                //内检外检才生效
+                if (taskOrderDO.getCheckType() == 100 || taskOrderDO.getCheckType() == 200){
+                    BoilerTaskOrderItemReportDO lastCompletedReport = boilerTaskOrderItemReportMapper
+                            .selectLastCompletedByTemplate(itemDO.getEquipId(),
+                                    taskOrderDO.getCheckType(),
+                                    itemReportDO.getTemplateId(),
+                                    boilerTaskOrderItemReportDOId);
+                    if (lastCompletedReport != null) {
 //                    JSONObject lastData = JSONObject.parseObject(lastCompletedReport.getDataJson());
-//                    // 不覆盖的字段：报告编号、检验人、检验日期、主检人、校核人和校核日期
-//                    Set<String> excludeKeys = Set.of("reportNo", "checkName", "checkDate", "recheckName", "recheckDate");
 //                    for (String key : lastData.keySet()) {
 //                        if (!excludeKeys.contains(key) && !jsonObject.containsKey(key)) {
 //                            jsonObject.put(key, lastData.get(key));
 //                        }
 //                    }
-                    // 不覆盖的字段：报告编号、检验人、检验日期、主检人、校核人和校核日期
-                    Set<String> excludeKeys = Set.of("reportNo", "checkName", "checkDate", "recheckName", "recheckDate");
-                    List<DynamicTbValDO> valList = dynamicTbValService.getDynamicTbValByRefId(lastCompletedReport.getId());
-                    if (valList != null && !valList.isEmpty()){
-                        List<DynamicTbColDO> ColsList = dynamicTbColService.lambdaQuery()
-                                .eq(DynamicTbColDO::getTbId, itemReportDO.getTemplateId())
-                                .or().eq(DynamicTbColDO::getColRound, 3).list();
-                        ColsList.forEach(v -> {
-                            String colCode = v.getColCode();
-                            valList.forEach(val -> {
-                                if (val.getColCode() != null && val.getColCode().equals(colCode)){
-                                    if (!excludeKeys.contains(colCode) && !jsonObject.containsKey(colCode)) {
-                                        jsonObject.put(colCode, val.getValValue());
+                        // 不覆盖的字段：报告编号、检验人、检验日期、主检人、校核人和校核日期
+                        Set<String> excludeKeys = Set.of("reportNo", "checkName", "checkDate", "recheckName", "recheckDate");
+                        List<DynamicTbValDO> valList = dynamicTbValService.getDynamicTbValByRefId(lastCompletedReport.getId());
+                        if (valList != null && !valList.isEmpty()){
+                            List<DynamicTbColDO> ColsList = dynamicTbColService.lambdaQuery()
+                                    .eq(DynamicTbColDO::getTbId, itemReportDO.getTemplateId())
+                                    .or().eq(DynamicTbColDO::getColRound, 3).list();
+                            ColsList.forEach(v -> {
+                                String colCode = v.getColCode();
+                                valList.forEach(val -> {
+                                    if (val.getColCode() != null && val.getColCode().equals(colCode)){
+                                        if (!excludeKeys.contains(colCode) && !jsonObject.containsKey(colCode)) {
+                                            jsonObject.put(colCode, val.getValValue());
+                                        }
                                     }
-                                }
+                                });
                             });
-                        });
+                        }
                     }
                 }
             }

tz-module-system/tz-module-system-biz/src/main/resources/application-prod.yaml

@@ -186,15 +186,15 @@ feign:
 # 集成cas相关配置信息
 cas:
   # 单点登录URL
-  #server-url-prefix: https://auth.gzsei.work/prod-api/protocols/cas20
-  server-url-prefix: http://192.168.19.80/prod-api/protocols/cas20
+  server-url-prefix: https://auth.gzsei.work/prod-api/protocols/cas20
+  #server-url-prefix: http://192.168.19.80/prod-api/protocols/cas20
   # CAS 过滤器拦截的 URL 路径模式（只拦截后台管理系统，不影响移动端/小程序等）
   url-patterns: /admin-api/*
   # 忽略的地址
   ignore-url-list: /admin-api/system/auth/**,/admin-api/system/cas/**,/file/**,/tile/**,/actuator/**,/druid/**,/swagger-ui/**,/v3/api-docs/**,/webjars/**,/error
   # 认证成功后回调地址
-  #front-url: http://192.168.19.165:40081
-  front-url: https://cyjw.gzsei.work
+  front-url: http://192.168.19.165:40081
+  #front-url: https://cyjw.gzsei.work
   # cas客户端地址
-  #client-host-url: http://192.168.19.165:40081
-  client-host-url: https://cyjw.gzsei.work
+  client-host-url: http://192.168.19.165:40081
+  #client-host-url: https://cyjw.gzsei.work