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-api/src/main/resources/mapper/JgInstallationNoticeMapper.xml

@@ -100,11 +100,11 @@
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_installation_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equip_id
-                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equip_id
-                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equip_id
-                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equip_id
-                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equip_id
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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/feign/TzsServiceFeignClient.java

@@ -10,7 +10,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 
-@FeignClient(name = "TZS-YMT-LL", url = "172.16.3.155:11000", path = "/ymt", configuration =
+@FeignClient(name = "TZS-YMT",  path = "/ymt", configuration =
         {FeignConfiguration.class})
 public interface TzsServiceFeignClient {
 

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

@@ -51,6 +51,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -158,7 +159,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 checkEsData(record);
             }
         } catch (Exception e) {
-            //删除Es数据
+            log.error(e.getMessage(), e);
+            //删除数据库数据和ES数据
+            if (!ObjectUtils.isEmpty(record)) {
+                List<String> records = new ArrayList<>();
+                records.add(record);
+                superviseInfoMapper.deleteDataAll(records);
+                esEquipmentCategory.deleteById(record);
+            }
+            ResponseModel<Object> response = new ResponseModel<>();
+            response.setDevMessage(e.getMessage());
+            response.setResult(null);
+            response.setMessage("操作失败，请检查数据输入后重新提交");
+            response.setStatus(HttpStatus.BAD_REQUEST.value());
+            return response;
         }
         return ResponseHelper.buildResponse(record);
     }
@@ -409,9 +423,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (!ValidationUtil.isEmpty(level)) {
                 if (LEVEL.equals(level)) {
                     //企业
-                    if(!ValidationUtil.isEmpty(level) && ValidationUtil.equals(type,"使用单位")){
+                    if(!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type,"使用单位")){
                         map.put("USE_UNIT_CREDIT_CODE", companyCode);
-                    }else if(!ValidationUtil.isEmpty(level) && ValidationUtil.equals(type,"安装改造维修单位")){
+                    }else if(!ValidationUtil.isEmpty(type) && ValidationUtil.equals(type,"安装改造维修单位")){
                         map.put("USC_UNIT_CREDIT_CODE", companyCode);
                     }
 

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;
@@ -24,14 +25,11 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 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.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzsJgOtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzsJgRegistrationInfo;
 
 
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
@@ -40,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -382,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);
@@ -439,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)) {
@@ -533,9 +533,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         return urls;
     }
 
-    public boolean submit(JgInstallationNoticeDto noticeDto,String op) {
+    public boolean submit(JgInstallationNotice notice,String op) {
 
-        AjaxResult ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId());
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         String taskId = dataObject.getString("id");
         //组装信息
@@ -573,7 +573,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     public void accept(JgInstallationNoticeDto dto,String op) {
 
-        convertField(dto);
+        JgInstallationNotice jgInstallationNotice = this.jgInstallationNoticeMapper.selectById(dto.getSequenceNbr());
         // 组装设备注册代码
         StringBuffer stringBuffer = new StringBuffer();
         String ym = null;
@@ -595,32 +595,30 @@ 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();
 
 
-        boolean submit = submit(dto, op);
+        boolean submit = submit(jgInstallationNotice, op);
         if(submit) {
             if("0".equals(op)) {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
-                this.generateInstallationNoticeReport(dto.getSequenceNbr());
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
             } else {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-                dto.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
-            JgInstallationNotice bean = new JgInstallationNotice();
-            BeanUtils.copyProperties(dto,bean);
-            bean.setEquRegisterCode(deviceRegistrationCode);
-            jgInstallationNoticeMapper.updateById(bean);
+            jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
+            jgInstallationNoticeMapper.updateById(jgInstallationNotice);
 
             // 更新其他业务表
             tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());

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

@@ -5,6 +5,10 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication">
         select
+        tzjia.sequence_nbr,
+        tzjia.process_instance_id,
+        tzjia.workflow_node,
+        tzjia.biz_type,
         tzjia.application_no,
         tzjia.inspection_type,
         (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.inspection_classify and cb_data_dictionary.type = 'JYJCLB') as inspectionClassify,

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

@@ -50,4 +50,12 @@ public class CommonController extends BaseController {
     public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
         return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitList());
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getInspectionUnit/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询检验检测机构基本信息", notes = "查询检验检测机构基本信息")
+    public ResponseModel<TzBaseEnterpriseInfo> getInspectionUnitBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitBySequenceNbr(sequenceNbr));
+    }
+
 }

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

@@ -100,7 +100,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     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())){
+		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/CommonserviceImpl.java

@@ -52,4 +52,8 @@ public class CommonserviceImpl {
     public List<TzBaseEnterpriseInfo> getInspectionUnitList() {
         return enterpriseInfoMapper.getInspectionUnitList(UNIT_TYPE);
     }
+
+    public TzBaseEnterpriseInfo getInspectionUnitBySequenceNbr(Long sequenceNbr) {
+        return enterpriseInfoMapper.selectBySeq(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

@@ -279,7 +279,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         execueFlow(params);
         // 执行接收业务
         String type = (String) params.get("type");
-        Long sequenceNbr = (Long) params.get("sequenceNbr");
+        Long sequenceNbr = Long.parseLong((String) params.get("sequenceNbr"));
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {

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

@@ -348,19 +348,23 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (ObjectUtils.isEmpty(ajaxResult1)) {
 
             }
-            updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
             if (op.equals("0")) {
                 String originalDataId = params.get("originalDataId").toString();
                 JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
-                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().replace("[", "").replace("]", "").split(","));
+                List<String> detectionRegion = (List<String>) params.get("detectionRegion");
 //                String detectionRegionName =  params.get("detectionRegionName").toString();
+                if(!detectionRegion.isEmpty()){
                     jyjcOpeningApplication.setDetectionRegion(detectionRegion);
+                }
 //                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
                 if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
                     jyjcOpeningApplication.setAcceptDate(new Date());
                 }
                 jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
             }
+
+            updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -421,7 +425,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         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());
+        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/dto/ESEquipmentCategoryDto.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.ymt.api.dto;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -104,6 +103,6 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String USC_UNIT_NAME;
 
-    @Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false)
+    @Field(type = FieldType.Text)
     private String USC_DATE;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzBaseEnterpriseInfoMapper.java

@@ -52,4 +52,15 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	 *
 	 */
 	List<TzBaseEnterpriseInfo> getInspectionUnitList(@Param("unitType") String unitType);
+
+	/**
+	 * 根据ID查找企业详情信息
+	 *
+	 *
+	 * @param sequenceNbr sequenceNbr
+	 * @return {@link  TzBaseEnterpriseInfo}
+	 * @author yangyang
+	 * @throws
+	 */
+	TzBaseEnterpriseInfo selectBySeq(Long sequenceNbr);
 }

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;

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

@@ -94,7 +94,7 @@
                CONSTRUCTION_TYPE,
                USC_UNIT_CREDIT_CODE,
                USC_UNIT_NAME,
-               USC_DATE
+               DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}
     </select>

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

@@ -159,5 +159,7 @@
 		from tz_base_enterprise_info
 		where unit_type LIKE CONCAT('%',#{unitType},'%')
 	</select>
-
+	<select id="selectBySeq" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo">
+		select * from tz_base_enterprise_info where sequence_nbr = #{sequenceNbr}
+	</select>
 </mapper>