Explorar o código

修复ErpOrderInfo文件编码问题

seyason hai 2 semanas
pai
achega
155ce4de97

+ 10 - 11
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ErpOrderInfo.java

@@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 工时申请单
+ * 工时申请单
  * </p>
  *
  * @author Seyason
@@ -31,49 +29,49 @@ public class ErpOrderInfo extends Model<ErpOrderInfo> {
     private Integer id;
 
     /**
-     * 工单编号
+     * 宸ュ崟缂栧彿
      */
     @TableField("order_id")
     private String orderId;
 
     /**
-     * 项目编号
+     * 椤圭洰缂栧彿
      */
     @TableField("project_id")
     private String projectId;
 
     /**
-     * 项目名称
+     * 椤圭洰鍚嶇О
      */
     @TableField("project_name")
     private String projectName;
 
     /**
-     * 行号
+     * 琛屽彿
      */
     @TableField("line")
     private Integer line;
 
     /**
-     * 工单状态 NA-开立/FM-锁定/OP-审核/CL-关闭
+     * 工单状态 NA-开立/FM-锁定/OP-审核/CL-关闭
      */
     @TableField("status")
     private Integer status;
 
     /**
-     * 同步主键id
+     * 鍚屾�涓婚敭id
      */
     @TableField("moDId")
     private String moDId;
 
     /**
-     * 生产工单日期
+     * 鐢熶骇宸ュ崟鏃ユ湡
      */
     @TableField("rels_date")
     private LocalDateTime relsDate;
 
     /**
-     * 外部系统部门id,也是code
+     * 澶栭儴绯荤粺閮ㄩ棬id锛屼篃鏄痗ode
      */
     @TableField("dept_id")
     private String deptId;
@@ -91,4 +89,5 @@ public class ErpOrderInfo extends Model<ErpOrderInfo> {
     protected Serializable pkVal() {
         return this.id;
     }
+
 }

+ 6 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ErpOrderInfoMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.management.platform.mapper.ErpOrderInfoMapper">
 
+    <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.ErpOrderInfo">
         <id column="id" property="id" />
         <result column="order_id" property="orderId" />
@@ -14,16 +15,17 @@
         <result column="dept_id" property="deptId" />
     </resultMap>
 
+    <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, order_id, project_id, project_name, line, status, moDId, rels_date, dept_id
     </sql>
     <insert id="batchInsert">
         insert into erp_order_info(order_id, project_id, project_name, line, status,rels_date,moDId,dept_id)
         VALUES
-            
-            <foreach collection="resList" separator="," item="res">
-                (#{res.orderId},#{res.projectId},#{res.projectName},#{res.line},#{res.status},#{res.relsDate},#{res.moDId},#{res.deptId})
-            </foreach>
+
+        <foreach collection="resList" separator="," item="res">
+            (#{res.orderId},#{res.projectId},#{res.projectName},#{res.line},#{res.status},#{res.relsDate},#{res.moDId},#{res.deptId})
+        </foreach>
     </insert>
     <select id="getExistIds" resultType="java.lang.String">
         select moDId