Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/caxx/vo/CaxxPageReqVO.java

@@ -97,7 +97,7 @@ public class CaxxPageReqVO extends PageParam {
     private String khlxdh;
 
     @Schema(description = "客户身份证号(社会统一信用代码)")
-    private String khbm;
+    private String khbh;
 
 
     @Schema(description = "仓房代码")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/caxx/vo/CaxxRespVO.java

@@ -128,7 +128,7 @@ public class CaxxRespVO {
 
     @Schema(description = "客户身份证号(社会统一信用代码)")
     @ExcelProperty("客户身份证号(社会统一信用代码)")
-    private String khbm;
+    private String khbh;
 
     @Schema(description = "仓房代码")
     @ExcelProperty("仓房代码")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/caxx/vo/CaxxSaveReqVO.java

@@ -92,7 +92,7 @@ public class CaxxSaveReqVO {
     private String khlxdh;
 
     @Schema(description = "客户身份证号(社会统一信用代码)")
-    private String khbm;
+    private String khbh;
 
 
     @Schema(description = "仓房代码")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxRespVO.java

@@ -52,7 +52,7 @@ public class CrkxxRespVO {
 
     @Schema(description = "附件多个逗号隔开','(INFRA_FILE.ID)")
     @ExcelProperty("附件多个逗号隔开','(INFRA_FILE.ID)")
-    private String fileIds;
+    private Set<Long> fileIds;
 
     @Schema(description = "承运人")
     @ExcelProperty("承运人")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/crkxx/vo/CrkxxSaveReqVO.java

@@ -3,6 +3,7 @@ package com.unis.module.coding.controller.admin.crkxx.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
 import java.util.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -33,7 +34,7 @@ public class CrkxxSaveReqVO {
     private Integer crklx;
 
     @Schema(description = "附件多个逗号隔开','(INFRA_FILE.ID)")
-    private List fileIds;
+    private Set<Long> fileIds;
 
     @Schema(description = "承运人")
     private String cyr;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/zjxx/vo/ZjxxRespVO.java

@@ -54,6 +54,6 @@ public class ZjxxRespVO {
 
     @Schema(description = "附件多个逗号隔开'',''(INFRA_FILE.ID)")
     @ExcelProperty("附件多个逗号隔开'',''(INFRA_FILE.ID)")
-    private String fileIds;
+    private Set<Long> fileIds;
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/zjxx/vo/ZjxxSaveReqVO.java

@@ -45,7 +45,7 @@ public class ZjxxSaveReqVO {
     private Integer sfhg;
 
     @Schema(description = "附件多个逗号隔开'',''(INFRA_FILE.ID)")
-    private List fileIds;
+    private Set<Long> fileIds;
 
     @Schema(description = "创建者")
     private String creator;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/crkxx/CrkxxDO.java

@@ -1,14 +1,17 @@
 package com.unis.module.coding.dal.dataobject.crkxx;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sun.xml.bind.v2.TODO;
 import com.unis.framework.mybatis.core.dataobject.BaseDO;
+import com.unis.framework.mybatis.core.type.JsonLongSetTypeHandler;
 import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Set;
 
 /**
  * 出入库信息 DO
@@ -55,7 +58,7 @@ public class CrkxxDO extends BaseDO {
     /**
      * 附件多个逗号隔开','(INFRA_FILE.ID)
      */
-//    @TableField(value = "FILE_IDS", typeHandler = StringListTypeHandler.class)
+//    @TableField(value = "FILE_IDS", typeHandler = JsonLongSetTypeHandler.class)
     private String fileIds;
     /**
      * 承运人

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/caxx/CaxxServiceImpl.java

@@ -82,7 +82,6 @@ public class CaxxServiceImpl implements CaxxService {
         validateCaxxExists(updateReqVO.getId());
         // 更新
         CaxxDO updateObj = BeanUtils.toBean(updateReqVO, CaxxDO.class);
-        updateObj.setKhbh(updateReqVO.getKhbm());
         caxxMapper.updateById(updateObj);
     }
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/crkxx/CrkxxServiceImpl.java

@@ -57,10 +57,12 @@ public class CrkxxServiceImpl implements CrkxxService {
             }
             crkxx.setId(YitIdHelper.nextId());
             crkxx.setDeleted(false);
+            crkxx.setFileIds(crkxx.getFileIds().replaceFirst("^\"", "").replaceAll("\"$", ""));
             crkxxMapper.insert(crkxx);
         }
         else if (ObjectUtil.isEmpty(createReqVO.getId())) {
             //更改
+            crkxx.setFileIds(crkxx.getFileIds().replaceFirst("^\"", "").replaceAll("\"$", ""));
             crkxxMapper.updateById(crkxx);
         }
         // 返回
@@ -72,8 +74,10 @@ public class CrkxxServiceImpl implements CrkxxService {
         // 校验存在
         validateCrkxxExists(updateReqVO.getId());
         // 更新
-        CrkxxDO updateObj = BeanUtils.toBean(updateReqVO, CrkxxDO.class);
-        crkxxMapper.updateById(updateObj);
+        CrkxxDO crkxx = BeanUtils.toBean(updateReqVO, CrkxxDO.class);
+        crkxx.setFileIds(crkxx.getFileIds().replaceFirst("^\"", "").replaceAll("\"$", ""));
+
+        crkxxMapper.updateById(crkxx);
     }
 
     @Override

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/zjxx/ZjxxServiceImpl.java

@@ -55,8 +55,11 @@ public class ZjxxServiceImpl implements ZjxxService {
                 //将已经存在的货位卡id放进去
                 zjxx.setHwkId(hwks.get(0).getId());
             }
+            zjxx.setFileIds(zjxx.getFileIds().replaceFirst("^\"", "").replaceAll("\"$", ""));
+
             zjxxMapper.insert(zjxx);
         } else {
+            zjxx.setFileIds(zjxx.getFileIds().replaceFirst("^\"", "").replaceAll("\"$", ""));
             zjxxMapper.updateById(zjxx);
         }
         // 返回
@@ -68,8 +71,10 @@ public class ZjxxServiceImpl implements ZjxxService {
         // 校验存在
         validateZjxxExists(updateReqVO.getId());
         // 更新
-        ZjxxDO updateObj = BeanUtils.toBean(updateReqVO, ZjxxDO.class);
-        zjxxMapper.updateById(updateObj);
+        ZjxxDO zjxx = BeanUtils.toBean(updateReqVO, ZjxxDO.class);
+        zjxx.setFileIds(zjxx.getFileIds().replaceFirst("^\"", "").replaceAll("\"$", ""));
+
+        zjxxMapper.updateById(zjxx);
     }
 
     @Override