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

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/CommonServiceImpl.java

@@ -343,7 +343,7 @@ public class CommonServiceImpl implements ICommonService {
         map.put("giveOutMonth", Optional.ofNullable(map.get("giveOutMonth")).orElse("").toString());  // 发证日期-月
         map.put("giveOutDay", Optional.ofNullable(map.get("giveOutDay")).orElse("").toString());  // 发证日期-日
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 70, 65);
+        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 100, 100);
         map.put("supervisoryCode", qrCode);  // 监管二维码
 
         // word转pdf

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -638,7 +638,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             ubuilder.should(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", useCode));
 
             String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
-            ubuilder.should(QueryBuilders.termQuery("USC_UNIT_CREDIT_CODE.keyword", uscCode));
+            ubuilder.should(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
             ubuilder.minimumShouldMatch(1);
             boolMust.must(ubuilder);
         }else {
@@ -651,8 +651,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
             if (!ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
                 BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
-                String param = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
-                uuccBuilder.must(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", param));
+                String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE"));
+                uuccBuilder.must(QueryBuilders.matchPhraseQuery("USC_UNIT_CREDIT_CODE", "*" + uscCode + "*"));
                 boolMust.must(uuccBuilder);
             }
         }
@@ -729,6 +729,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ValidationUtil.isEmpty(company)) {
             object.put("level", company.getLevel());
             object.put("orgCode", company.getOrgCode());
+            object.put("companyName", company.getCompanyName());
             object.put("companyCode", company.getCompanyCode());
             CompanyModel result = Privilege.companyClient.queryByCompanyCode(company.getCompanyCode()).getResult();
             if(!ValidationUtil.isEmpty(result)){
@@ -768,9 +769,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         iIdxBizJgFactoryInfoService.saveOrUpdateData(factoryInfo);
 
         //施工信息
+        JSONObject company = getCompanyType();
+        String companyName = company.getString("companyName");
+        String companyCode = company.getString("companyCode").contains("_") ?
+                company.getString("companyCode").split("_")[1] : company.getString("companyCode");
         IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
         constructionInfo.setRecord(record);
         constructionInfo.setRecDate(date);
+        constructionInfo.setUscUnitCreditCode(companyCode);
+        constructionInfo.setUscUnitName(companyName);
         constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
         iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
 

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/JgEquipTransferServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -304,6 +305,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         String userId = RequestContext.getExeUserId();
         JgEquipTransfer jgEquipTransfer = this.baseMapper.selectById(jgEquipTransferDto.getSequenceNbr());
         jgEquipTransfer.setProcessAdvice(jgEquipTransferDto.getProcessAdvice());
+        JgEquipTransferEq jgEquipTransferEq = jgEquipTransferEqMapper.selectOne(Wrappers.<JgEquipTransferEq>lambdaQuery().select(JgEquipTransferEq::getEquId)
+                .eq(JgEquipTransferEq::getEquipTransferId, jgEquipTransferDto.getSequenceNbr()));
 
         ArrayList<String> roleList = new ArrayList<>();
         boolean submit = submit(jgEquipTransfer, op);
@@ -315,6 +318,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                 if (roleList.isEmpty()) {
                     jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     jgEquipTransfer.setPromoter("");
+                    if (jgEquipTransferEq != null){
+                        Map<String,Map<String,Object>> resultMap = new HashMap<>();
+                        Map<String,Object> esParamMap =new HashMap<>();
+                        esParamMap.put("USC_UNIT_NAME", jgEquipTransfer.getInstallUnitName());
+                        esParamMap.put("USC_UNIT_CREDIT_CODE", jgEquipTransfer.getInstallUnitName());
+                        resultMap.put(jgEquipTransferEq.getEquId(),esParamMap);
+                        tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+                    }
                 } else {
                     jgEquipTransfer.setNextExecuteIds(String.join(",", roleList));
                     if (!ObjectUtils.isEmpty(jgEquipTransfer.getInstanceStatus())) {

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/JgTransferNoticeServiceImpl.java

@@ -548,7 +548,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         dto.setTaskId(taskId);
         dto.setComment("提交流程");
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        if(notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615") ) {
+            map.put("approvalStatus", "提交");
+        } else {
+            map.put("approvalStatus", op);
+        }
+
         dto.setVariable(map);
         //执行流程
         AjaxResult ajaxResult1 = null;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -95,7 +95,6 @@
                CONSTRUCTION_TYPE,
                USC_UNIT_CREDIT_CODE,
                USC_UNIT_NAME,
-               DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE,
                EQU_DEFINE,
                EQU_DEFINE_CODE,
                PRODUCT_NAME,

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

@@ -2471,6 +2471,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         if(paramMap.isEmpty()){
             return null;
         }
+        String oldUscUnitCreditCode = "";
+        String oldUscUnitName = "";
         Map<String, Object> resultMap = new HashMap<>();
         for (Map.Entry<String, Map<String, Object>> entry : paramMap.entrySet()) {
             String record = entry.getKey();
@@ -2481,15 +2483,22 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
                 if(!ObjectUtils.isEmpty(optional)){
                     oldData = optional.get();
+                    oldUscUnitCreditCode = oldData.getUSC_UNIT_CREDIT_CODE();
+                    oldUscUnitName = oldData.getUSC_UNIT_NAME();
                 }
                 //获取Es中新的参数
                 ESEquipmentCategoryDto newData = JSON.parseObject(toJSONString(childMap), ESEquipmentCategoryDto.class);
+                String newUscUnitCreditCode = newData.getUSC_UNIT_CREDIT_CODE();
+                String newUscUnitName = newData.getUSC_UNIT_NAME();
 
                 //删除Es中旧的数据
                 if (!ObjectUtils.isEmpty(oldData)) {
                     esEquipmentCategory.deleteById(record);
                     //整合新旧数据
                     Bean.copyExistPropertis(newData, oldData);
+                    //处理施工单位信息
+                    oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode+","+newUscUnitCreditCode);
+                    oldData.setUSC_UNIT_NAME(oldUscUnitName+","+newUscUnitName);
                 }
                 if (!ObjectUtils.isEmpty(oldData)) {
                     oldData.setREC_DATE(System.currentTimeMillis());