设备数据迁移

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

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

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -94,7 +94,6 @@ public class CmcProjectController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProject cmcProject)
     {
-        cmcProject.setProjectId(new SnowFlake().generateId());
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 
@@ -107,7 +106,6 @@ public class CmcProjectController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcProject cmcProject = new CmcProject();
-        cmcProject.setProjectId(new SnowFlake().generateId());
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
         cmcProject.setProjectLeader(formDataJson.getString("projectLeader"));
@@ -122,6 +120,7 @@ public class CmcProjectController extends BaseController
         cmcProject.setCreateTime(DateUtils.getNowDate());
         cmcProject.setIsFinished("0");
         cmcProject.setRemark(formDataJson.getString("remark"));
+        cmcProjectService.insertCmcProject(cmcProject);
         String workList = formDataJson.getString("workList");
         workList = workList.substring(1, workList.length() - 1);
         if (workList.split("}").length > 1) {
@@ -155,7 +154,7 @@ public class CmcProjectController extends BaseController
             cmcProjectWork.setRemark(workArrObject.getString("remark"));
             cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
         }
-        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
+        return success("新增成功");
     }
 
     /**
@@ -202,7 +201,7 @@ public class CmcProjectController extends BaseController
                 JSONObject workArrObject = JSONObject.parse(workArri);
                 CmcProjectWork cmcProjectWork = new CmcProjectWork();
                 cmcProjectWork.setWorkId(new SnowFlake().generateId());
-                cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
+                cmcProjectWork.setProjectId(formDataJson.getInteger("projectId"));
                 cmcProjectWork.setContent(workArrObject.getString("content"));
                 cmcProjectWork.setScale(workArrObject.getString("scale"));
                 cmcProjectWork.setUnit(workArrObject.getString("unit"));
@@ -217,7 +216,7 @@ public class CmcProjectController extends BaseController
             cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
             CmcProjectWork cmcProjectWork = new CmcProjectWork();
             cmcProjectWork.setWorkId(new SnowFlake().generateId());
-            cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
+            cmcProjectWork.setProjectId(formDataJson.getInteger("projectId"));
             cmcProjectWork.setContent(workArrObject.getString("content"));
             cmcProjectWork.setScale(workArrObject.getString("scale"));
             cmcProjectWork.setUnit(workArrObject.getString("unit"));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDevice.java

@@ -21,6 +21,10 @@ public class CmcDevice extends BaseEntity
     /** 设备id */
     private Integer deviceId;
 
+    /** 设备编码 */
+    @Excel(name = "设备编码")
+    private String deviceNumber;
+
     /** 出厂编号 */
     @Excel(name = "出厂编号")
     private String code;
@@ -88,6 +92,15 @@ public class CmcDevice extends BaseEntity
     {
         return deviceId;
     }
+    public void setDeviceNumber(String deviceNumber)
+    {
+        this.deviceNumber = deviceNumber;
+    }
+
+    public String getDeviceNumber()
+    {
+        return deviceNumber;
+    }
     public void setCode(String code)
     {
         this.code = code;
@@ -219,6 +232,7 @@ public class CmcDevice extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("deviceId", getDeviceId())
+                .append("deviceNumber", getDeviceNumber())
                 .append("code", getCode())
                 .append("name", getName())
                 .append("type", getType())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java

@@ -25,6 +25,10 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "申请人")
     private Long applier;
 
+    /** 使用部门 */
+    @Excel(name = "使用部门")
+    private Long dept;
+
     /** 设备id */
     @Excel(name = "设备id")
     private String devices;
@@ -97,12 +101,12 @@ public class CmcDeviceApproval extends BaseEntity
     @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date returnDate;
 
-    public void setDeviceApplyId(String deviceApplyId) 
+    public void setDeviceApplyId(String deviceApplyId)
     {
         this.deviceApplyId = deviceApplyId;
     }
 
-    public String getDeviceApplyId() 
+    public String getDeviceApplyId()
     {
         return deviceApplyId;
     }
@@ -115,6 +119,15 @@ public class CmcDeviceApproval extends BaseEntity
     {
         return applier;
     }
+    public void setDept(Long dept)
+    {
+        this.dept = dept;
+    }
+
+    public Long getDept()
+    {
+        return dept;
+    }
     public void setDevices(String devices)
     {
         this.devices = devices;
@@ -274,7 +287,7 @@ public class CmcDeviceApproval extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("deviceApplyId", getDeviceApplyId())
             .append("applier", getApplier())
-            .append("deviceId", getDevices())
+            .append("devices", getDevices())
             .append("projectId", getProjectId())
             .append("applyReason", getApplyReason())
             .append("beginDate", getBeginDate())

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -16,7 +16,7 @@ public class CmcProject extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 项目id */
-    private String projectId;
+    private Integer projectId;
 
     /** 项目编号 */
     @Excel(name = "项目编号")
@@ -74,12 +74,12 @@ public class CmcProject extends BaseEntity
     @Excel(name = "承担部门")
     private String undertakingDept;
 
-    public void setProjectId(String projectId)
+    public void setProjectId(Integer projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId()
+    public Integer getProjectId()
     {
         return projectId;
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProjectWork.java

@@ -21,7 +21,7 @@ public class CmcProjectWork extends BaseEntity
     private String workId;
 
     /** 项目id */
-    private String projectId;
+    private Integer projectId;
 
     /** 工作内容 */
     @Excel(name = "工作内容")
@@ -53,12 +53,12 @@ public class CmcProjectWork extends BaseEntity
     {
         return workId;
     }
-    public void setProjectId(String projectId)
+    public void setProjectId(Integer projectId)
     {
         this.projectId = projectId;
     }
 
-    public String getProjectId()
+    public Integer getProjectId()
     {
         return projectId;
     }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcDeviceApproval" id="CmcDeviceApprovalResult">
         <result property="deviceApplyId"    column="device_apply_id"    />
         <result property="applier"    column="applier"    />
+        <result property="dept"    column="dept"    />
         <result property="devices"    column="devices"    />
         <result property="projectId"    column="project_id"    />
         <result property="applyReason"    column="apply_reason"    />
@@ -27,13 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        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
+        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
     </sql>
 
     <select id="selectCmcDeviceApprovalList" parameterType="CmcDeviceApproval" resultMap="CmcDeviceApprovalResult">
         <include refid="selectCmcDeviceApprovalVo"/>
         <where>  
             <if test="applier != null "> and applier = #{applier}</if>
+            <if test="dept != null "> and dept = #{dept}</if>
             <if test="devices != null  and devices != ''"> and devices = #{devices}</if>
             <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">device_apply_id,</if>
             <if test="applier != null">applier,</if>
+            <if test="dept != null">dept,</if>
             <if test="devices != null">devices,</if>
             <if test="projectId != null">project_id,</if>
             <if test="applyReason != null">apply_reason,</if>
@@ -85,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
             <if test="applier != null">#{applier},</if>
+            <if test="dept != null">#{dept},</if>
             <if test="devices != null">#{devices},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="applyReason != null">#{applyReason},</if>
@@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update cmc_device_approval
         <trim prefix="SET" suffixOverrides=",">
             <if test="applier != null">applier = #{applier},</if>
+            <if test="dept != null">dept = #{dept},</if>
             <if test="devices != null">devices = #{devices},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="CmcDevice" id="CmcDeviceResult">
         <result property="deviceId"    column="device_id"    />
+        <result property="deviceNumber"    column="device_number"    />
         <result property="code"    column="code"    />
         <result property="name"    column="name"    />
         <result property="type"    column="type"    />
@@ -24,13 +25,14 @@
     </resultMap>
 
     <sql id="selectCmcDeviceVo">
-        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
+        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
     </sql>
 
     <select id="selectCmcDeviceList" parameterType="CmcDevice" resultMap="CmcDeviceResult">
         <include refid="selectCmcDeviceVo"/>
         <where>
-            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="deviceNumber != null  and deviceNumber != ''"> and device_number like concat('%', #{deviceNumber}, '%')</if>
+            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
             <if test="acquisitionTime != null "> and acquisition_time = #{acquisitionTime}</if>
@@ -55,6 +57,7 @@
     <insert id="insertCmcDevice" parameterType="CmcDevice" useGeneratedKeys="true" keyProperty="deviceId">
         insert into cmc_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceNumber != null">device_number,</if>
             <if test="code != null">code,</if>
             <if test="name != null">name,</if>
             <if test="type != null">type,</if>
@@ -72,6 +75,7 @@
             <if test="manageDept != null">manage_dept,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceNumber != null">#{deviceNumber},</if>
             <if test="code != null">#{code},</if>
             <if test="name != null">#{name},</if>
             <if test="type != null">#{type},</if>
@@ -93,6 +97,7 @@
     <update id="updateCmcDevice" parameterType="CmcDevice">
         update cmc_device
         <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceNumber != null">device_number = #{deviceNumber},</if>
             <if test="code != null">code = #{code},</if>
             <if test="name != null">name = #{name},</if>
             <if test="type != null">type = #{type},</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -43,7 +43,7 @@
         </where>
     </select>
 
-    <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">
+    <select id="selectCmcProjectByProjectId" parameterType="Integer" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where project_id = #{projectId}
     </select>
@@ -110,11 +110,11 @@
         where project_id = #{projectId}
     </update>
 
-    <delete id="deleteCmcProjectByProjectId" parameterType="String">
+    <delete id="deleteCmcProjectByProjectId" parameterType="Integer">
         delete from cmc_project where project_id = #{projectId}
     </delete>
 
-    <delete id="deleteCmcProjectByProjectIds" parameterType="String">
+    <delete id="deleteCmcProjectByProjectIds" parameterType="Integer">
         delete from cmc_project where project_id in
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
             #{projectId}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectWorkMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcProjectWorkListByProjectId" parameterType="String" resultMap="CmcProjectWorkResult">
+    <select id="selectCmcProjectWorkListByProjectId" parameterType="Integer" resultMap="CmcProjectWorkResult">
         <include refid="selectCmcProjectWorkVo"/>
         where project_id = #{projectId}
     </select>
@@ -73,11 +73,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where work_id = #{workId}
     </update>
 
-    <delete id="deleteCmcProjectWorkByProjectId" parameterType="String">
+    <delete id="deleteCmcProjectWorkByProjectId" parameterType="Integer">
         delete from cmc_project_work where project_id = #{projectId}
     </delete>
 
-    <delete id="deleteCmcProjectWorkByProjectIds" parameterType="String">
+    <delete id="deleteCmcProjectWorkByProjectIds" parameterType="Integer">
         delete from cmc_project_work where project_id in
         <foreach item="projectId" collection="array" open="(" separator="," close=")">
             #{projectId}