Merge branch 'develop_tzs_register' into develop_tze_register_his

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -19,10 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 管道工程装置表服务实现类
@@ -120,9 +119,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .page(page);
         pageList.getRecords().forEach(record -> {
             record.setDataSourceName(EquipSourceEnum.getDataSourceName(record.getDataSource()));
-            record.setFullAddress(record.getProvinceName()+record.getCityName()+record.getCountyName()+record.getStreetName()+record.getAddress());
-            record.setCan_edit(this.checkContraptionIsCanEdit(record.getSequenceNbr()));
-            record.setCan_delete(this.checkContraptionIsCanDelete(record.getSequenceNbr()));
+            record.setFullAddress(
+                    Stream.of(record.getProvinceName(), record.getCityName(), record.getCountyName(), record.getStreetName(), record.getAddress())
+                            .map(value -> value == null ? "" : value)
+                            .collect(Collectors.joining())
+            );
+            record.setCanEdit(this.checkContraptionIsCanEdit(record.getSequenceNbr()));
+            record.setCanDelete(this.checkContraptionIsCanDelete(record.getSequenceNbr()));
         });
         return pageList;
     }

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

@@ -1068,18 +1068,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgRegistrationHistory.setChangeData(JSON.toJSONString(mapData));
             jgRegistrationHistoryService.updateById(jgRegistrationHistory);
             // 装置表写入使用登记证编号、将装置名称写入到使用登记表
-            updateRegAndProjectContrapt(jgUseRegistration);
+            updateRegAndProjectContraption(jgUseRegistration, mapData);
         }
         this.getBaseMapper().updateById(jgUseRegistration);
         commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
     }
 
-    private void updateRegAndProjectContrapt(JgUseRegistration jgUseRegistration) {
+    private void updateRegAndProjectContraption(JgUseRegistration jgUseRegistration, JSONObject mapData) {
         if(!StringUtils.isEmpty(jgUseRegistration.getProjectContraptionId())){
             IdxBizJgProjectContraption jgProjectContraption = jgProjectContraptionService.getById(jgUseRegistration.getProjectContraptionId());
             jgUseRegistration.setProjectContraption(jgProjectContraption.getProjectContraption());
             jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
-            jgProjectContraption.setUseDate(String.valueOf(jgUseRegistration.getAuditPassDate()));
+            jgProjectContraption.setUseDate(String.valueOf(mapData.get("useDate")));
             jgProjectContraptionService.updateById(jgProjectContraption);
         }
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java

@@ -237,13 +237,13 @@ public class IdxBizJgProjectContraption extends BaseEntity {
      *  是否可编辑
      */
     @TableField(exist = false)
-    private Boolean can_edit;
+    private Boolean canEdit;
 
     /**
      *  是否可删除
      */
     @TableField(exist = false)
-    private Boolean can_delete;
+    private Boolean canDelete;
 
     /**
      *  使用地址
@@ -260,6 +260,6 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     /**
      * 投入日期
      */
-    @TableField("USE_DATE")
+    @TableField("use_date")
     private String useDate;
 }