Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -1571,7 +1571,7 @@ public class ReportController {
                                     report.setIsAssist(true);
                                 }
                             } else {
-                                errorMsg = "工时系统中尚未给部门:"+first.get().getDeptName()+"设置部门编号";
+                                errorMsg = "工时系统中尚未设置部门编号:"+first.get().getDeptId();
                             }
                         }
                     } else {

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

@@ -1,44 +1,82 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+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;
 
-import java.util.Date;
-
+/**
+ * <p>
+ * 工时申请单
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-04-29
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class ErpOrderInfo extends Model<ErpOrderInfo> {
+
     private static final long serialVersionUID=1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     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-关闭
+     */
     @TableField("status")
     private Integer status;
 
+    /**
+     * 同步主键id
+     */
     @TableField("moDId")
     private String moDId;
 
+    /**
+     * 生产工单日期
+     */
     @TableField("rels_date")
-    private Date relsDate;
+    private LocalDateTime relsDate;
+
+    /**
+     * 外部系统部门id，也是code
+     */
+    @TableField("dept_id")
+    private String deptId;
 
     @TableField(exist = false)
     private Integer pageIndex;
@@ -49,10 +87,8 @@ public class ErpOrderInfo extends Model<ErpOrderInfo> {
     @TableField(exist = false)
     private String trueProjectId;
 
-    @TableField("dept_id")
-    private String deptId;
-
-//    @TableField("dept_name")
-    @TableField(exist = false)
-    private String deptName;
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -194,10 +194,9 @@ public class DataCollectTask {
 
 
     @Scheduled(cron = "0 0 1 * * ?")
-//    @Scheduled(cron = "0 45 10 * * ?")
     @Async
     public void sqlServerTask() {
-//        if(isDev){return;}
+        if(isDev){return;}
         RestTemplate restTemplate = new RestTemplate();
         String sumUrl = PREFIX_URL+"/dataCollect/getSqlServerDataSum";
         String listUrl = PREFIX_URL+"/dataCollect/getSqlServerDataList";

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

@@ -1,11 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!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" />
+        <result column="project_id" property="projectId" />
+        <result column="project_name" property="projectName" />
+        <result column="line" property="line" />
+        <result column="status" property="status" />
+        <result column="moDId" property="moDId" />
+        <result column="rels_date" property="relsDate" />
+        <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>
@@ -37,9 +52,9 @@
     </select>
     <select id="getWithProject" resultType="com.management.platform.entity.ErpOrderInfo">
         select eoi.id,eoi.order_id,eoi.project_id,eoi.project_name,eoi.line,eoi.status,eoi.moDId,
-               p.id as trueProjectId
+        p.id as trueProjectId
         from erp_order_info eoi
-                 left join project p on eoi.project_id = p.project_code
+        left join project p on eoi.project_id = p.project_code
         where p.company_id = #{specialCompanyId}
         and eoi.id in <foreach collection="erpIds" item="erpId" open="(" close=")" separator=",">#{erpId}</foreach>
     </select>