Quellcode durchsuchen

设备数据迁移

lamphua vor 1 Jahr
Ursprung
Commit
94b2633d12

BIN
oa-back/null/avatar/2024/01/23/xk_20240123141413A001.jpeg Datei anzeigen


BIN
oa-back/null/avatar/2024/01/23/xk_20240123141417A002.jpeg Datei anzeigen


+ 1
- 0
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java Datei anzeigen

@@ -115,6 +115,7 @@ public class CmcDeviceApprovalController extends BaseController
115 115
         CmcDeviceApproval cmcDeviceApproval = new CmcDeviceApproval();
116 116
         cmcDeviceApproval.setDeviceApplyId(formDataJson.getString("formId"));
117 117
         cmcDeviceApproval.setApplier(getLoginUser().getUserId());
118
+        cmcDeviceApproval.setDept(getLoginUser().getDeptId());
118 119
         cmcDeviceApproval.setApplyDate(DateUtils.getNowDate());
119 120
         cmcDeviceApproval.setProjectId(formDataJson.getString("projectNumber"));
120 121
         cmcDeviceApproval.setApplyReason(formDataJson.getString("applyReason"));

+ 4
- 5
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java Datei anzeigen

@@ -94,7 +94,6 @@ public class CmcProjectController extends BaseController
94 94
     @PostMapping
95 95
     public AjaxResult add(@RequestBody CmcProject cmcProject)
96 96
     {
97
-        cmcProject.setProjectId(new SnowFlake().generateId());
98 97
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
99 98
     }
100 99
 
@@ -107,7 +106,6 @@ public class CmcProjectController extends BaseController
107 106
     {
108 107
         JSONObject formDataJson = JSONObject.parse(formData);
109 108
         CmcProject cmcProject = new CmcProject();
110
-        cmcProject.setProjectId(new SnowFlake().generateId());
111 109
         cmcProject.setProjectName(formDataJson.getString("projectName"));
112 110
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
113 111
         cmcProject.setProjectLeader(formDataJson.getString("projectLeader"));
@@ -122,6 +120,7 @@ public class CmcProjectController extends BaseController
122 120
         cmcProject.setCreateTime(DateUtils.getNowDate());
123 121
         cmcProject.setIsFinished("0");
124 122
         cmcProject.setRemark(formDataJson.getString("remark"));
123
+        cmcProjectService.insertCmcProject(cmcProject);
125 124
         String workList = formDataJson.getString("workList");
126 125
         workList = workList.substring(1, workList.length() - 1);
127 126
         if (workList.split("}").length > 1) {
@@ -155,7 +154,7 @@ public class CmcProjectController extends BaseController
155 154
             cmcProjectWork.setRemark(workArrObject.getString("remark"));
156 155
             cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
157 156
         }
158
-        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
157
+        return success("新增成功");
159 158
     }
160 159
 
161 160
     /**
@@ -202,7 +201,7 @@ public class CmcProjectController extends BaseController
202 201
                 JSONObject workArrObject = JSONObject.parse(workArri);
203 202
                 CmcProjectWork cmcProjectWork = new CmcProjectWork();
204 203
                 cmcProjectWork.setWorkId(new SnowFlake().generateId());
205
-                cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
204
+                cmcProjectWork.setProjectId(formDataJson.getInteger("projectId"));
206 205
                 cmcProjectWork.setContent(workArrObject.getString("content"));
207 206
                 cmcProjectWork.setScale(workArrObject.getString("scale"));
208 207
                 cmcProjectWork.setUnit(workArrObject.getString("unit"));
@@ -217,7 +216,7 @@ public class CmcProjectController extends BaseController
217 216
             cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
218 217
             CmcProjectWork cmcProjectWork = new CmcProjectWork();
219 218
             cmcProjectWork.setWorkId(new SnowFlake().generateId());
220
-            cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
219
+            cmcProjectWork.setProjectId(formDataJson.getInteger("projectId"));
221 220
             cmcProjectWork.setContent(workArrObject.getString("content"));
222 221
             cmcProjectWork.setScale(workArrObject.getString("scale"));
223 222
             cmcProjectWork.setUnit(workArrObject.getString("unit"));

+ 14
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDevice.java Datei anzeigen

@@ -21,6 +21,10 @@ public class CmcDevice extends BaseEntity
21 21
     /** 设备id */
22 22
     private Integer deviceId;
23 23
 
24
+    /** 设备编码 */
25
+    @Excel(name = "设备编码")
26
+    private String deviceNumber;
27
+
24 28
     /** 出厂编号 */
25 29
     @Excel(name = "出厂编号")
26 30
     private String code;
@@ -88,6 +92,15 @@ public class CmcDevice extends BaseEntity
88 92
     {
89 93
         return deviceId;
90 94
     }
95
+    public void setDeviceNumber(String deviceNumber)
96
+    {
97
+        this.deviceNumber = deviceNumber;
98
+    }
99
+
100
+    public String getDeviceNumber()
101
+    {
102
+        return deviceNumber;
103
+    }
91 104
     public void setCode(String code)
92 105
     {
93 106
         this.code = code;
@@ -219,6 +232,7 @@ public class CmcDevice extends BaseEntity
219 232
     public String toString() {
220 233
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
221 234
                 .append("deviceId", getDeviceId())
235
+                .append("deviceNumber", getDeviceNumber())
222 236
                 .append("code", getCode())
223 237
                 .append("name", getName())
224 238
                 .append("type", getType())

+ 16
- 3
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java Datei anzeigen

@@ -25,6 +25,10 @@ public class CmcDeviceApproval extends BaseEntity
25 25
     @Excel(name = "申请人")
26 26
     private Long applier;
27 27
 
28
+    /** 使用部门 */
29
+    @Excel(name = "使用部门")
30
+    private Long dept;
31
+
28 32
     /** 设备id */
29 33
     @Excel(name = "设备id")
30 34
     private String devices;
@@ -97,12 +101,12 @@ public class CmcDeviceApproval extends BaseEntity
97 101
     @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
98 102
     private Date returnDate;
99 103
 
100
-    public void setDeviceApplyId(String deviceApplyId) 
104
+    public void setDeviceApplyId(String deviceApplyId)
101 105
     {
102 106
         this.deviceApplyId = deviceApplyId;
103 107
     }
104 108
 
105
-    public String getDeviceApplyId() 
109
+    public String getDeviceApplyId()
106 110
     {
107 111
         return deviceApplyId;
108 112
     }
@@ -115,6 +119,15 @@ public class CmcDeviceApproval extends BaseEntity
115 119
     {
116 120
         return applier;
117 121
     }
122
+    public void setDept(Long dept)
123
+    {
124
+        this.dept = dept;
125
+    }
126
+
127
+    public Long getDept()
128
+    {
129
+        return dept;
130
+    }
118 131
     public void setDevices(String devices)
119 132
     {
120 133
         this.devices = devices;
@@ -274,7 +287,7 @@ public class CmcDeviceApproval extends BaseEntity
274 287
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
275 288
             .append("deviceApplyId", getDeviceApplyId())
276 289
             .append("applier", getApplier())
277
-            .append("deviceId", getDevices())
290
+            .append("devices", getDevices())
278 291
             .append("projectId", getProjectId())
279 292
             .append("applyReason", getApplyReason())
280 293
             .append("beginDate", getBeginDate())

+ 3
- 3
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java Datei anzeigen

@@ -16,7 +16,7 @@ public class CmcProject extends BaseEntity
16 16
     private static final long serialVersionUID = 1L;
17 17
 
18 18
     /** 项目id */
19
-    private String projectId;
19
+    private Integer projectId;
20 20
 
21 21
     /** 项目编号 */
22 22
     @Excel(name = "项目编号")
@@ -74,12 +74,12 @@ public class CmcProject extends BaseEntity
74 74
     @Excel(name = "承担部门")
75 75
     private String undertakingDept;
76 76
 
77
-    public void setProjectId(String projectId)
77
+    public void setProjectId(Integer projectId)
78 78
     {
79 79
         this.projectId = projectId;
80 80
     }
81 81
 
82
-    public String getProjectId()
82
+    public Integer getProjectId()
83 83
     {
84 84
         return projectId;
85 85
     }

+ 3
- 3
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProjectWork.java Datei anzeigen

@@ -21,7 +21,7 @@ public class CmcProjectWork extends BaseEntity
21 21
     private String workId;
22 22
 
23 23
     /** 项目id */
24
-    private String projectId;
24
+    private Integer projectId;
25 25
 
26 26
     /** 工作内容 */
27 27
     @Excel(name = "工作内容")
@@ -53,12 +53,12 @@ public class CmcProjectWork extends BaseEntity
53 53
     {
54 54
         return workId;
55 55
     }
56
-    public void setProjectId(String projectId)
56
+    public void setProjectId(Integer projectId)
57 57
     {
58 58
         this.projectId = projectId;
59 59
     }
60 60
 
61
-    public String getProjectId()
61
+    public Integer getProjectId()
62 62
     {
63 63
         return projectId;
64 64
     }

+ 6
- 1
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml Datei anzeigen

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
7 7
     <resultMap type="CmcDeviceApproval" id="CmcDeviceApprovalResult">
8 8
         <result property="deviceApplyId"    column="device_apply_id"    />
9 9
         <result property="applier"    column="applier"    />
10
+        <result property="dept"    column="dept"    />
10 11
         <result property="devices"    column="devices"    />
11 12
         <result property="projectId"    column="project_id"    />
12 13
         <result property="applyReason"    column="apply_reason"    />
@@ -27,13 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
27 28
     </resultMap>
28 29
 
29 30
     <sql id="selectCmcDeviceApprovalVo">
30
-        select device_apply_id, applier, devices, project_id, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
31
+        select device_apply_id, applier, dept, devices, project_id, apply_reason, apply_date, return_date, begin_date, begin_halfday, end_date, end_halfday, days, dept_user_id, dept_comment, manager_user_id, manager_comment, dispatcher, dispatch_comment, estimate_cost from cmc_device_approval
31 32
     </sql>
32 33
 
33 34
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
34 35
         <include refid="selectCmcDeviceApprovalVo"/>
35 36
         <where>  
36 37
             <if test="applier != null "> and applier = #{applier}</if>
38
+            <if test="dept != null "> and dept = #{dept}</if>
37 39
             <if test="devices != null  and devices != ''"> and devices = #{devices}</if>
38 40
             <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
39 41
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
64 66
         <trim prefix="(" suffix=")" suffixOverrides=",">
65 67
             <if test="deviceApplyId != null">device_apply_id,</if>
66 68
             <if test="applier != null">applier,</if>
69
+            <if test="dept != null">dept,</if>
67 70
             <if test="devices != null">devices,</if>
68 71
             <if test="projectId != null">project_id,</if>
69 72
             <if test="applyReason != null">apply_reason,</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
85 88
         <trim prefix="values (" suffix=")" suffixOverrides=",">
86 89
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
87 90
             <if test="applier != null">#{applier},</if>
91
+            <if test="dept != null">#{dept},</if>
88 92
             <if test="devices != null">#{devices},</if>
89 93
             <if test="projectId != null">#{projectId},</if>
90 94
             <if test="applyReason != null">#{applyReason},</if>
@@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
109 113
         update cmc_device_approval
110 114
         <trim prefix="SET" suffixOverrides=",">
111 115
             <if test="applier != null">applier = #{applier},</if>
116
+            <if test="dept != null">dept = #{dept},</if>
112 117
             <if test="devices != null">devices = #{devices},</if>
113 118
             <if test="projectId != null">project_id = #{projectId},</if>
114 119
             <if test="applyReason != null">apply_reason = #{applyReason},</if>

+ 7
- 2
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceMapper.xml Datei anzeigen

@@ -6,6 +6,7 @@
6 6
 
7 7
     <resultMap type="CmcDevice" id="CmcDeviceResult">
8 8
         <result property="deviceId"    column="device_id"    />
9
+        <result property="deviceNumber"    column="device_number"    />
9 10
         <result property="code"    column="code"    />
10 11
         <result property="name"    column="name"    />
11 12
         <result property="type"    column="type"    />
@@ -24,13 +25,14 @@
24 25
     </resultMap>
25 26
 
26 27
     <sql id="selectCmcDeviceVo">
27
-        select device_id, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, check_term, check_time, warranty, manage_dept from cmc_device
28
+        select device_id, device_number, code, name, type, acquisition_time, cost, expect_life, series, brand, day_cost, place, remark, check_term, check_time, warranty, manage_dept from cmc_device
28 29
     </sql>
29 30
 
30 31
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
31 32
         <include refid="selectCmcDeviceVo"/>
32 33
         <where>
33
-            <if test="code != null  and code != ''"> and code = #{code}</if>
34
+            <if test="deviceNumber != null  and deviceNumber != ''"> and device_number like concat('%', #{deviceNumber}, '%')</if>
35
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
34 36
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
35 37
             <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
36 38
             <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
@@ -55,6 +57,7 @@
55 57
     <insert id="insertCmcDevice" parameterType="CmcDevice" useGeneratedKeys="true" keyProperty="deviceId">
56 58
         insert into cmc_device
57 59
         <trim prefix="(" suffix=")" suffixOverrides=",">
60
+            <if test="deviceNumber != null">device_number,</if>
58 61
             <if test="code != null">code,</if>
59 62
             <if test="name != null">name,</if>
60 63
             <if test="type != null">type,</if>
@@ -72,6 +75,7 @@
72 75
             <if test="manageDept != null">manage_dept,</if>
73 76
         </trim>
74 77
         <trim prefix="values (" suffix=")" suffixOverrides=",">
78
+            <if test="deviceNumber != null">#{deviceNumber},</if>
75 79
             <if test="code != null">#{code},</if>
76 80
             <if test="name != null">#{name},</if>
77 81
             <if test="type != null">#{type},</if>
@@ -93,6 +97,7 @@
93 97
     <update id="updateCmcDevice" parameterType="CmcDevice">
94 98
         update cmc_device
95 99
         <trim prefix="SET" suffixOverrides=",">
100
+            <if test="deviceNumber != null">device_number = #{deviceNumber},</if>
96 101
             <if test="code != null">code = #{code},</if>
97 102
             <if test="name != null">name = #{name},</if>
98 103
             <if test="type != null">type = #{type},</if>

+ 3
- 3
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml Datei anzeigen

@@ -43,7 +43,7 @@
43 43
         </where>
44 44
     </select>
45 45
 
46
-    <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
46
+    <select id="selectCmcProjectByProjectId" parameterType="Integer" resultMap="CmcProjectResult">
47 47
         <include refid="selectCmcProjectVo"/>
48 48
         where project_id = #{projectId}
49 49
     </select>
@@ -110,11 +110,11 @@
110 110
         where project_id = #{projectId}
111 111
     </update>
112 112
 
113
-    <delete id="deleteCmcProjectByProjectId" parameterType="String">
113
+    <delete id="deleteCmcProjectByProjectId" parameterType="Integer">
114 114
         delete from cmc_project where project_id = #{projectId}
115 115
     </delete>
116 116
 
117
-    <delete id="deleteCmcProjectByProjectIds" parameterType="String">
117
+    <delete id="deleteCmcProjectByProjectIds" parameterType="Integer">
118 118
         delete from cmc_project where project_id in
119 119
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
120 120
             #{projectId}

+ 3
- 3
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectWorkMapper.xml Datei anzeigen

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
30 30
         </where>
31 31
     </select>
32 32
     
33
-    <select id="selectCmcProjectWorkListByProjectId" parameterType="String" resultMap="CmcProjectWorkResult">
33
+    <select id="selectCmcProjectWorkListByProjectId" parameterType="Integer" resultMap="CmcProjectWorkResult">
34 34
         <include refid="selectCmcProjectWorkVo"/>
35 35
         where project_id = #{projectId}
36 36
     </select>
@@ -73,11 +73,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
73 73
         where work_id = #{workId}
74 74
     </update>
75 75
 
76
-    <delete id="deleteCmcProjectWorkByProjectId" parameterType="String">
76
+    <delete id="deleteCmcProjectWorkByProjectId" parameterType="Integer">
77 77
         delete from cmc_project_work where project_id = #{projectId}
78 78
     </delete>
79 79
 
80
-    <delete id="deleteCmcProjectWorkByProjectIds" parameterType="String">
80
+    <delete id="deleteCmcProjectWorkByProjectIds" parameterType="Integer">
81 81
         delete from cmc_project_work where project_id in
82 82
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
83 83
             #{projectId}

+ 1696
- 400
oa-back/sql/sql.sql
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


Laden…
Abbrechen
Speichern