Merge remote-tracking branch 'origin/master'

delivery-framework/delivery-spring-boot-starter-mybatis/src/main/java/com/unis/framework/mybatis/core/type/JsonToListTypeHandler.java

@@ -0,0 +1,52 @@
+package com.unis.framework.mybatis.core.type;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.List;
+
+public class JsonToListTypeHandler extends BaseTypeHandler<List<String>> {
+    private static final ObjectMapper mapper = new ObjectMapper();
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
+        try {
+            ps.setString(i, mapper.writeValueAsString(parameter));
+        } catch (JsonProcessingException e) {
+            throw new SQLException("JSON序列化失败", e);
+        }
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        return parseJsonToList(rs.getString(columnName));
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        return parseJsonToList(rs.getString(columnIndex));
+    }
+
+    @Override
+    public List<String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        return parseJsonToList(cs.getString(columnIndex));
+    }
+
+    private List<String> parseJsonToList(String json) {
+        if (json == null || json.isEmpty()) {
+            return Collections.emptyList();
+        }
+        try {
+            return mapper.readValue(json, new TypeReference<List<String>>() {});
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("JSON解析失败", e);
+        }
+    }
+}

delivery-framework/delivery-spring-boot-starter-mybatis/src/main/java/com/unis/framework/mybatis/core/type/ListToStringTypeHandler.java

@@ -0,0 +1,46 @@
+package com.unis.framework.mybatis.core.type;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class ListToStringTypeHandler extends BaseTypeHandler<List<String>> {
+    private static final String DELIMITER = ","; // 分隔符
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
+        // 将 List 转为字符串存入数据库
+        ps.setString(i, String.join(DELIMITER, parameter));
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        String value = rs.getString(columnName);
+        return parseStringToList(value);
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        String value = rs.getString(columnIndex);
+        return parseStringToList(value);
+    }
+
+    @Override
+    public List<String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        String value = cs.getString(columnIndex);
+        return parseStringToList(value);
+    }
+
+    private List<String> parseStringToList(String value) {
+        if (value == null || value.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return Arrays.asList(value.split(DELIMITER));
+    }
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/caxx/CaxxDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.unis.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -114,6 +115,7 @@ public class CaxxDO extends BaseDO {
      * 客户名称(单位名称)
      */
     private String khmc;
+
     /**
      * 客户联系电话
      */
@@ -124,6 +126,8 @@ public class CaxxDO extends BaseDO {
      */
     private String khbh;
 
-    /** 备选状态 */
+    /**
+     * 备选状态
+     */
     private Integer bxzt;
 }

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

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