Merge branch 'develop_tzs_register' of…

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

@@ -4,11 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
@@ -20,30 +23,35 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 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.mapper.IdxBizJgRegisterInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
-import com.yeejoin.amos.feign.workflow.model.*;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.collections.CollectionUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
+
 /**
  * 改造变更登记服务实现类
  *
@@ -774,11 +782,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             throw new BadRequest("使用登记证导出失败,监管码为空!");
         }
         exportParamsMap.put("supervisoryCode", jgChangeRegistrationReform.getSupervisoryCode());
-        //发证日期（当前时间）
-        LocalDate today = LocalDate.now();
-        exportParamsMap.put("giveOutYear", today.getYear());
-        exportParamsMap.put("giveOutMonth", today.getMonthValue());
-        exportParamsMap.put("giveOutDay", today.getDayOfMonth());
+
+        getAuditPassedDate(jgChangeRegistrationReform.getAuditPassDate(), exportParamsMap);
 
         //查询设备注册信息
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", jgChangeRegistrationReformEq.getEquId()));

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

@@ -62,11 +62,12 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
+
 /**
  * 移装变更登记登记服务实现类
  *
@@ -1025,11 +1026,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             throw new BadRequest("使用登记证导出失败,监管码为空!");
         }
         exportParamsMap.put("supervisoryCode", transfer.getSupervisoryCode());
-        //发证日期（当前时间）
-        LocalDate today = LocalDate.now();
-        exportParamsMap.put("giveOutYear", today.getYear());
-        exportParamsMap.put("giveOutMonth", today.getMonthValue());
-        exportParamsMap.put("giveOutDay", today.getDayOfMonth());
+
+        getAuditPassedDate(transfer.getAuditPassDate(), exportParamsMap);
+
         //设备使用地址
         if (!ValidationUtil.isEmpty(transferHistory)) {
             String fullAddress = "";

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

@@ -6,11 +6,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
@@ -32,6 +35,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -39,17 +43,16 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
+
 /**
  * 单位变更登记服务实现类
  *
@@ -1004,11 +1007,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         queryWrapper1.eq(OtherInfo::getRecord, jgChangeRegistrationUnitEq.getEquId());
         OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
         exportParamsMap.put("supervisoryCode", tzsJgOtherInfo.getSupervisoryCode());
-        //发证日期（当前时间）
-        LocalDate today = LocalDate.now();
-        exportParamsMap.put("giveOutYear", today.getYear());
-        exportParamsMap.put("giveOutMonth", today.getMonthValue());
-        exportParamsMap.put("giveOutDay", today.getDayOfMonth());
+
+        getAuditPassedDate(transfer.getAuditPassDate(), exportParamsMap);
+
         //设备使用地址
 
 

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

@@ -54,6 +54,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -931,11 +932,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             throw new BadRequest("使用登记证导出失败,监管码为空!");
         }
         exportParamsMap.put("supervisoryCode", useRegistration.getSupervisoryCode());
-        // 发证日期（当前时间）
-        LocalDate today = LocalDate.now();
-        exportParamsMap.put("giveOutYear", today.getYear());
-        exportParamsMap.put("giveOutMonth", today.getMonthValue());
-        exportParamsMap.put("giveOutDay", today.getDayOfMonth());
+        getAuditPassedDate(useRegistration.getAuditPassDate(), exportParamsMap);
 
         // 查询设备注册信息
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", useRegistrationEq.getEquId()));
@@ -1025,6 +1022,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    /**
+     * @param auditPassDate 通过时间
+     * @param exportParamsMap 参数map
+     * */
+    public static void getAuditPassedDate(Date auditPassDate, Map<String, Object> exportParamsMap) {
+        LocalDate today;
+        if (ValidationUtil.isEmpty(auditPassDate)) {
+            // 发证日期为空取当前时间
+            today = LocalDate.now();
+        } else {
+            today = auditPassDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        }
+        exportParamsMap.put("giveOutYear", today.getYear());
+        exportParamsMap.put("giveOutMonth", today.getMonthValue());
+        exportParamsMap.put("giveOutDay", today.getDayOfMonth());
+    }
+
     private UseFlagParamDto buildUseFlagParamDto(JgUseRegistration useRegistration, IdxBizJgRegisterInfo registerInfo, IdxBizJgFactoryInfo factoryInfo, Map<String, Object> exportParamsMap) {
         UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
         useFlagParamDto.setReceiveCompanyCode(useRegistration.getReceiveCompanyCode());