1、个人证件有效期调整

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BasePersonRegisterDto.java

@@ -6,7 +6,6 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -36,7 +35,7 @@ public class BasePersonRegisterDto extends BaseDto {
 
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty(value = "有效期结束")
-    private Date expirationDateEnd;
+    private String expirationDateEnd;
 
     @ApiModelProperty(value = "有效期类型")
     private String expirationDateType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzIndividualityDto.java

@@ -35,7 +35,7 @@ public class TzIndividualityDto extends BaseDto {
     private Date expirationDateStart;
 
     @ApiModelProperty(value = "有效期结束")
-    private Date expirationDateEnd;
+    private String expirationDateEnd;
 
     @ApiModelProperty(value = "有效期类型")
     private String expirationDateType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsBaseIndividualityDto.java

@@ -34,7 +34,7 @@ public class TzsBaseIndividualityDto  extends BaseDto {
     private Date expirationDateStart;
 
     @ApiModelProperty(value = "有效期结束")
-    private Date expirationDateEnd;
+    private String expirationDateEnd;
 
     @ApiModelProperty(value = "有效期类型")
     private String expirationDateType;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsBaseIndividuality.java

@@ -50,7 +50,7 @@ public class TzsBaseIndividuality extends BaseEntity {
      *
      */
 	@TableField("expiration_date_end")
-    private Date expirationDateEnd;
+    private String expirationDateEnd;
 
     /**
      *

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

@@ -428,10 +428,11 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
      */
     @Override
     public Map<String, String> createSupervisorCode(Map<String, Object> map) {
-        String city, county, equipCategory, isNotXiXian;
+        String city, county, equipCategory, isNotXiXian, code96333;
         // 获取对应行政区划
         city = String.valueOf(map.get("cityCode"));
         county = String.valueOf(map.get("countyCode"));
+        code96333 = String.valueOf(map.get("code96333"));
         // 获取对应设备分类
         equipCategory = String.valueOf(map.get("equCategory"));
         if ("null".equals(equipCategory) || "null".equals(city) || "null".equals(county)) {
@@ -440,7 +441,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         isNotXiXian = Optional.ofNullable(map.get("isXiXian")).orElse("0").toString();
         // 生成码
         EquipmentCategoryServiceImpl categoryService = (EquipmentCategoryServiceImpl) AopContext.currentProxy();
-        Map<String, String> codeMap = creatCode(isNotXiXian, city, county, equipCategory, "null", "null");
+        Map<String, String> codeMap = creatCode(isNotXiXian, city, county, equipCategory, code96333, "null");
         if (ObjectUtils.isEmpty(codeMap)) {
             throw new BadRequest("该请求参数未生成监管码或96333码,请核对参数");
         }