Merge branch 'develop_tzs_register_to_0715' of…

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

@@ -517,9 +517,11 @@
                jsi.ORG_BRANCH_NAME,
                joi.SUPERVISORY_CODE,
                jsi.RECORD       as id,
-               jsi.SEQUENCE_NBR as sequenceNbr
+               jsi.SEQUENCE_NBR as sequenceNbr,
+               jfi.PRODUCE_DATE as produceDate
         from idx_biz_jg_supervision_info jsi
                  LEFT JOIN idx_biz_jg_other_info joi on jsi."RECORD" = joi."RECORD"
+                 LEFT JOIN idx_biz_jg_factory_info jfi on jsi."RECORD" = jfi."RECORD"
         WHERE jsi.RECORD = #{record}
 
 

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.ymt.api.service.IGenerateCodeService;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.ymt.biz.dao.ESElavtorRepository;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.ymt.biz.utils.StringUtils;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.PrivilegeFeginService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -72,6 +73,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -930,6 +933,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         result.put(equipmentMessage.getDesInfo(), desInfo);
         // 监督管理信息
         Map<String, Object> supInfo = getSupInfo(map);
+        if(!ValidationUtil.isEmpty(supInfo.get("produceDate"))){
+            LocalDate produceDate = LocalDate.parse(supInfo.get("produceDate").toString().substring(0, 10), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            LocalDate localDate = LocalDate.now().minusYears(15);
+            if(produceDate.isBefore(localDate)){
+                supInfo.put("OVER_FIFTEEN_YEARS","0");
+            }else{
+                supInfo.put("OVER_FIFTEEN_YEARS","1");
+            }
+        }
         if ("1".equals(useInfo.get("IS_NOT_XIXIAN"))) {
             supInfo.put("CITY", "咸阳");
         } else {