fix(jg)：安装告知bug修复

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,15 +20,14 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -35,8 +37,10 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 
 
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.ObjectUtils;
@@ -68,11 +72,14 @@ import java.text.ParseException;
  * @date 2023-12-12
  */
 @Service
+@Slf4j
 public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationNoticeDto,JgInstallationNotice,JgInstallationNoticeMapper> implements IJgInstallationNoticeService {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "installationNotificationNew";
     private static final String TABLE_PAGE_ID = "1734141426742095873";
+    private static final String CONSTRUCTION_TYPE = "SGLX";
+    private static final String CONSTRUCTION_TYPE_NAME = "安装";
 
 
     //西安行政区划code
@@ -89,8 +96,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     @Autowired
     private JgInstallationNoticeMapper jgInstallationNoticeMapper;
-    @Autowired
-    private ICreateCodeService iCreateCodeService;
+
 //    @Autowired
 //    private EquipmentCategoryServiceImpl equipmentCategoryService;
     @Autowired
@@ -102,6 +108,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
+    @Autowired
+    IIdxBizJgConstructionInfoService constructionInfoService;
+
+    @Autowired
+    IIdxBizJgUseInfoService useInfoService;
+
+    @Autowired
+    private DataDictionaryMapper dataDictionaryMapper;
+
 
 
     public static byte[] file2byte(File file) {
@@ -416,7 +431,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), deviceList.size());
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), deviceList.size());
+        if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
+            log.error("告知单获取失败: {}", listResponseModel.getMessage());
+            return;
+        }
+        List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
             return;
         }
@@ -673,7 +693,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         }
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void accept(JgInstallationNoticeDto dto,String op) {
         String[] taskName = new String[]{"流程结束"};
         String userId = RequestContext.getExeUserId();
@@ -750,6 +770,30 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
                     tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
 
+                    // 更新维保备案信息表
+                    IdxBizJgConstructionInfo idxBizJgConstructionInfo = constructionInfoService.queryNewestDetailByRecord(jgRelationEquip.getEquId());
+                    if (!ObjectUtils.isEmpty(idxBizJgConstructionInfo)) {
+                        idxBizJgConstructionInfo.setUscUnitCreditCode(jgInstallationNotice.getInstallUnitCreditCode());
+                        idxBizJgConstructionInfo.setUscUnitName(jgInstallationNotice.getInstallUnitName());
+                        idxBizJgConstructionInfo.setUscDate(jgInstallationNotice.getInstallStartDate());
+                        // 获取施工类型id
+                        LambdaQueryWrapper<DataDictionary> lambda = new LambdaQueryWrapper<>();
+                        lambda.eq(DataDictionary::getType, CONSTRUCTION_TYPE);
+                        lambda.eq(DataDictionary::getName, CONSTRUCTION_TYPE_NAME);
+                        List<DataDictionary> dataDictionaries = dataDictionaryMapper.selectList(lambda);
+                        if (!CollectionUtils.isEmpty(dataDictionaries)) {
+                            idxBizJgConstructionInfo.setConstructionType(String.valueOf(dataDictionaries.get(0).getSequenceNbr()));
+                        }
+                        constructionInfoService.saveOrUpdateData(idxBizJgConstructionInfo);
+                    }
+
+                    // 使用信息表更新是否西咸
+                    IdxBizJgUseInfo useInfo = useInfoService.getOneData(jgRelationEquip.getEquId());
+                    if (!ObjectUtils.isEmpty(useInfo)) {
+                        useInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian() == null ? "null" : jgInstallationNotice.getIsXixian().equals("0") ? "null" : "1");
+                        useInfoService.saveOrUpdateData(useInfo);
+                    }
+
                     TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                         @Override
                         public void afterCommit() {