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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgInstallationNoticeService.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 
@@ -56,7 +57,7 @@ public interface IJgInstallationNoticeService extends IService<JgInstallationNot
      * @param model      数据
      * @param submitType 保存类型
      */
-    void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> model);
+    void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> model, ReginParams reginParams);
 
     /**
      * 打印告知单

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationNoticeController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
@@ -44,7 +45,9 @@ public class JgInstallationNoticeController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增安装告知", notes = "新增安装告知")
     public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, JgInstallationNoticeDto> model) {
-        iJgInstallationNoticeService.saveNotice(submitType, model);
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        iJgInstallationNoticeService.saveNotice(submitType, model, reginParams);
         return ResponseHelper.buildResponse("");
     }
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -378,7 +379,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Override
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
-    public void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> jgInstallationNoticeDtoMap) {
+    public void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> jgInstallationNoticeDtoMap, ReginParams reginParams) {
         JgInstallationNoticeDto model = jgInstallationNoticeDtoMap.get(TABLE_PAGE_ID);
         // 字段转换
         convertField(model);
@@ -435,6 +436,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             int i = deviceList.indexOf(obj);
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
+            dto.setNoticeDate(new Date());
+            dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
+            dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(instanceIdList)) {
@@ -591,14 +595,14 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         queryWrapper2.eq(RegistrationInfo::getRecord,jgRelationEquip.getEquId());
         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
 
-        stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(dto.getCity()).append(ym);
+        stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgInstallationNotice.getCity()).append(ym);
         String equCode = stringBuffer.toString();
         String deviceRegistrationCode = iCreateCodeService.createDeviceRegistrationCode(equCode);
         Map<String, Object> map = new HashMap<>();
-        map.put("cityCode",dto.getCity());
-        map.put("countyCode",dto.getCounty());
+        map.put("cityCode",jgInstallationNotice.getCity());
+        map.put("countyCode",jgInstallationNotice.getCounty());
         map.put("equCategory",tzsJgRegistrationInfo.getEquCategory());
-        map.put("isXiXian",dto.getIsXixian());
+        map.put("isXiXian", jgInstallationNotice.getIsXixian() == null ? "0" : jgInstallationNotice.getIsXixian());
         Map<String, Object> mapCode;
         ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
         mapCode = code.getResult();

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -91,7 +91,7 @@
             idx_biz_jg_use_info ibjui
             left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
             left join idx_biz_jg_construction_info ibjci on ibjci.record = ibjri.record
-            left join idx_biz_jg_factory_info ibjfi on ibjci.record = ibjri.record
+            left join idx_biz_jg_factory_info ibjfi on ibjfi.record = ibjri.record
             left join idx_biz_jg_other_info ibjoi on ibjui.record = ibjoi.record
             left join amos_tzs_biz.tz_equipment_category tec on ibjri.equ_category = tec.code
             left join amos_tzs_biz.tz_equipment_category tec1 on ibjri.equ_list = tec1.code

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -99,8 +99,8 @@ public class JyjcOpeningApplicationController extends BaseController {
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
 		JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationServiceImpl.getById(sequenceNbr);
-		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()));
-		if(status.contains(jyjcOpeningApplication.getStatus())){
+		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()),String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+		if(!status.contains(jyjcOpeningApplication.getStatus())){
 			throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除！");
 		}
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.removeById(sequenceNbr));

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

@@ -121,19 +121,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationService.getBaseMapper().selectOne(wa);
 
             //检验检测结果方式
-            model.setResultType(jyjcOpeningApplication.getResultType());
+            if (jyjcOpeningApplication != null) {
+                model.setResultType(jyjcOpeningApplication.getResultType());
+            }
 
             model.setApplicationNo(UUID.randomUUID().toString());
             model.setApplicationDate(new Date());
             model = this.createWithModel(model);
             //保存报检装备监管码
             if (null != model.getEquip() && model.getEquip().size() > 0) {
-                List<Map<String, Object>> equip = model.getEquip();
-                List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
-                for (String s : jgm) {
+                List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class);
+                for (JyjcInspectionApplicationEquipModel equip : equips) {
                     JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
+                    equipInfo.setEquDefine(equip.getEquDefine());
+                    equipInfo.setEquList(equip.getEquList());
+                    equipInfo.setEquipUnicode(equip.getSuperVisonryCode());
+                    equipInfo.setEquCategory(equip.getEquCategoryName());
                     equipInfo.setApplicationSeq(model.getSequenceNbr());
-                    equipInfo.setEquipUnicode(s);
                     jyjcInspectionApplicationEquipService.save(equipInfo);
                 }
             }
@@ -152,18 +156,27 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
         } else {
+            LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.HAVE_PROCESSED.getCode());
+            JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationService.getBaseMapper().selectOne(wa);
 
+            //检验检测结果方式
+            if (jyjcOpeningApplication != null) {
+                model.setResultType(jyjcOpeningApplication.getResultType());
+            }
             //更新报检装备监管码
             jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             if (model.getEquip().size() > 0) {
                // List<Map<String, Object>> equip = model.getEquip();
                // List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
-                List<JyjcInspectionApplicationEquip> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquip.class);
-
-
-                for (JyjcInspectionApplicationEquip equip : equips) {
-                    equip.setApplicationSeq(model.getSequenceNbr());
-                    jyjcInspectionApplicationEquipService.save(equip);
+                List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class);
+                for (JyjcInspectionApplicationEquipModel equip : equips) {
+                    JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
+                    equipInfo.setEquDefine(equip.getEquDefine());
+                    equipInfo.setEquList(equip.getEquList());
+                    equipInfo.setEquipUnicode(equip.getSuperVisonryCode());
+                    equipInfo.setEquCategory(equip.getEquCategoryName());
+                    equipInfo.setApplicationSeq(model.getSequenceNbr());
+                    jyjcInspectionApplicationEquipService.save(equipInfo);
                 }
             }
 

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

@@ -424,8 +424,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     public Boolean deleteBatchByIds(List<Long> ids){
         List<JyjcOpeningApplication> jyjcOpeningApplicationList=jyjcOpeningApplicationMapper.selectList(new QueryWrapper<JyjcOpeningApplication>()
                 .in("sequence_nbr"));
-        List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()));
-        jyjcOpeningApplicationList = jyjcOpeningApplicationList.stream().filter(jyjcOpeningApplication ->!status.contains(jyjcOpeningApplication.getStatus())).collect(Collectors.toList());
+        List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()),String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+        jyjcOpeningApplicationList = jyjcOpeningApplicationList.stream().filter(jyjcOpeningApplication ->status.contains(jyjcOpeningApplication.getStatus())).collect(Collectors.toList());
         if(jyjcOpeningApplicationList.isEmpty()){
             throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除，请核对数据后重新提交！");
         }

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

@@ -32,7 +32,7 @@ public class CreateCodeServiceImpl implements ICreateCodeService {
     private static final String SEQUENCE_TYPE_UR = "%05d";
     private static final String SEQUENCE_TYPE = "%07d";
     private final RedisTemplate<String, String> redisTemplate;
-    private String rulePrefix;
+    private String rulePrefix = "";
 
     public CreateCodeServiceImpl(RedisTemplate<String, String> redisTemplate) {
         this.redisTemplate = redisTemplate;
@@ -198,14 +198,14 @@ public class CreateCodeServiceImpl implements ICreateCodeService {
                 String formattedSequence = String.format(sequenceType, currentSequence);
                 log.info("===================>更新《{}》顺序码：{}<===================", sequenceKey, formattedSequence);
                 // 更新顺序码
-                if (sequenceType.equals(LOCK_KEY_DR)) {
+                if (lockKey.equals(LOCK_KEY_DR)) {
                     setValueWithMonthlyExpiration(sequenceKey, String.valueOf(formattedSequence));
                 } else {
                     setValueWithYearlyExpiration(sequenceKey, String.valueOf(formattedSequence));
                 }
 
                 String generatedSequence = sequenceKey + formattedSequence;
-                String result = generatedSequence + (sequenceType.equals(LOCK_KEY_DR) ? "" : rulePrefix);
+                String result = generatedSequence + (lockKey.equals(LOCK_KEY_DR) ? "" : rulePrefix);
 
                 log.info("===================>返回《{}》顺序码：{}<===================", sequenceKey, result);
                 return result;