EOEG SAI - 删除dept_id字段

master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiApplyController.java

@@ -184,7 +184,6 @@ public class TEoegSaiApplyController extends BaseController
                 TEoegSaiApply entity = new TEoegSaiApply();
                 entity.setCreateTime(new Date());
                 entity.setCreateBy(userId.toString());
-                entity.setDeptId(10023L);
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);
                     //  cell.setCellType(CellType.STRING);
@@ -402,7 +401,6 @@ public class TEoegSaiApplyController extends BaseController
         String userId = getUserId().toString();
         tSaiApply.setCreateTime(new Date());
         tSaiApply.setCreateBy(userId);
-        tSaiApply.setDeptId(10023L);
         tSaiApply.setApplyStatus(0);
         tSaiApply.setHandler(tSaiApply.getApplicant());
         String saiType = tSaiApply.getSaiType();

master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiController.java

@@ -124,7 +124,6 @@ public class TEoegSaiController extends BaseController
             }
         }
         TEoegStaffmgr staffmgr = new TEoegStaffmgr();
-        staffmgr.setDeptId(10023L);
         List<TEoegStaffmgr> tStaffmgrs = staffmgrService.selectTStaffmgrList(staffmgr);
         int num = tStaffmgrs.size();
         if (sum.compareTo(BigDecimal.ZERO) != 0 && num != 0 && sum2.compareTo(BigDecimal.ZERO) != 0) {
@@ -165,7 +164,6 @@ public class TEoegSaiController extends BaseController
             }
         }
         TEoegStaffmgr staffmgr = new TEoegStaffmgr();
-        staffmgr.setDeptId(10023L);
         List<TEoegStaffmgr> tStaffmgrs = staffmgrService.selectTStaffmgrList(staffmgr);
         int num = tStaffmgrs.size();
         if (sum.compareTo(BigDecimal.ZERO) != 0 && num != 0) {

master/src/main/java/com/ruoyi/project/production/controller/vo/EoegSaiApplyQueryVO.java

@@ -31,9 +31,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     /** 删除状态 */
     private String delFlag;
 
-    /** 部门编号 */
-    private Long deptId;
-
     /** 问题描述 */
     @Excel(name = "问题描述")
     private String description;
@@ -321,15 +318,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     {
         return delFlag;
     }
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
     public void setApplyStatus(long applyStatus)
     {
         this.applyStatus = applyStatus;
@@ -566,7 +554,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
-                .append("deptId", getDeptId())
                 .append("applyStatus", getApplyStatus())
                 .append("apNo", getApNo())
                 .append("processId", getProcessId())

master/src/main/java/com/ruoyi/project/production/controller/vo/EoegSaiQueryVO.java

@@ -52,9 +52,6 @@ public class EoegSaiQueryVO extends BaseEntity
     /** 删除状态 */
     private String delFlag;
 
-    /** 部门编号 */
-    private Long deptId;
-
     /* 年份 */
     private int saiYear;
 
@@ -145,14 +142,6 @@ public class EoegSaiQueryVO extends BaseEntity
         return delFlag;
     }
 
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
     public void setDificiency(String dificiency) {
         this.dificiency = dificiency;
     }
@@ -182,7 +171,6 @@ public class EoegSaiQueryVO extends BaseEntity
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
-                .append("deptId", getDeptId())
                 .append("saiYear", getSaiYear())
                 .toString();
     }

master/src/main/resources/mybatis/production/TEoegSaiApplyMapper.xml

@@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="deptId"    column="dept_id"    />
         <result property="applyStatus"    column="apply_status"    />
         <result property="applyStatusString"    column="apply_status_string"    />
         <result property="apNo"    column="ap_no"    />
@@ -63,13 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="selectTEoegSaiApplyVo">
-        select d.sai_apply_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time, d.dept_id, d.apply_status, d.ap_no, d.process_id,
+        select d.sai_apply_id, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time, d.apply_status, d.ap_no, d.process_id,
         d.applicant, d.assessor, d.executor, d.inspectors, d.applicant_dept, d.applicant_team, d.description,
         d.unsafe_status, d.unsafe_action, d.apply_date, d.task_id, d.task_name,d.remarks, d.ve_item_other,
         d.handler, d.estimate_finish_date, d.actual_finish_date, d.reaction, d.ve_result,
         d.sai_level, d.category, d.remarks_assess, d.remarks_execute, d.work_area, d.sai_type, d.tpm_status, d.unsafe_choice
         from t_eoeg_sai_apply d
-        left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
     <select id="selectTSaiApplyList"
@@ -94,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="estimateFinishDateStart != null ">and estimate_finish_date <![CDATA[>=]]> #{estimateFinishDateStart}</if>
             <if test="estimateFinishDateEnd != null">and estimate_finish_date <![CDATA[<=]]>#{estimateFinishDateEnd}</if>
             <if test="saiApplyId != null "> and sai_apply_id = #{saiApplyId}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
             <if test="applyStatusString != null  and applyStatusString != ''">
                 and
@@ -162,7 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="deptId != null">dept_id,</if>
             <if test="applyStatus != null">apply_status,</if>
             <if test="apNo != null">ap_no,</if>
             <if test="processId != null">process_id,</if>
@@ -201,7 +197,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="deptId != null">#{deptId},</if>
             <if test="applyStatus != null">#{applyStatus},</if>
             <if test="apNo != null">#{apNo},</if>
             <if test="processId != null">#{processId},</if>
@@ -243,7 +238,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="applyStatus != null">apply_status = #{applyStatus},</if>
             <if test="apNo != null">ap_no = #{apNo},</if>
             <if test="processId != null">process_id = #{processId},</if>

master/src/main/resources/mybatis/production/TEoegSaiApproveFileMapper.xml

@@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fileUrl"    column="file_url"    />
         <result property="createTime"    column="create_time"    />
         <result property="fileType"    column="file_type"    />
-        <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTEoegSaiApproveFileVo">

master/src/main/resources/mybatis/production/TEoegSaiCategoryMapper.xml

@@ -13,12 +13,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="deptId"    column="dept_id"    />
     </resultMap>
 
     <sql id="selectTEoegSaiCategoryVo">
-        select d.sai_category_id, d.sai_category_description, d.sai_category_name, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time, d.dept_id from t_eoeg_sai_category d
-      left join sys_dept s on s.dept_id = d.dept_id
+        select d.sai_category_id, d.sai_category_description, d.sai_category_name, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time from t_eoeg_sai_category d
     </sql>
 
     <select id="selectTSaiCategoryList" parameterType="TEoegSaiCategory" resultMap="TEoegSaiCategoryResult">
@@ -27,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="saiCategoryId != null "> and sai_category_id = #{saiCategoryId}</if>
             <if test="saiCategoryName != null  and saiCategoryName != ''"> and sai_category_name like concat(concat('%', #{saiCategoryName}), '%')</if>
             <if test="saiCategoryDescription != null  and saiCategoryDescription != ''"> and sai_category_description like concat(concat('%', #{saiCategoryDescription}), '%')</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
             and d.del_flag = 0
         </where>
         order by d.sai_category_name asc
@@ -52,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saiCategoryId != null">#{saiCategoryId},</if>
@@ -63,7 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -77,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where sai_category_id = #{saiCategoryId}
     </update>

master/src/main/resources/mybatis/production/TEoegSaiFileMapper.xml

@@ -13,14 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createrDate"    column="creater_date"    />
         <result property="createrCode"    column="creater_code"    />
         <result property="remark"    column="remark"    />
-        <result property="deptId"    column="dept_id"    />
         <result property="delFlag"    column="del_flag"    />
-        <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTEoegSaiFileVo">
-        select d.id, d.file_name, d.file_url, d.file_type, d.dev_type, d.creater_date, d.creater_code, d.remark, d.dept_id, d.del_flag ,s.dept_name from t_eoeg_sai_file d
-      left join sys_dept s on s.dept_id = d.dept_id
+        select d.id, d.file_name, d.file_url, d.file_type, d.dev_type, d.creater_date, d.creater_code, d.remark, d.del_flag from t_eoeg_sai_file d
     </sql>
 
     <select id="selectTEoegSaiFileList" parameterType="TEoegSaiFile" resultMap="TEoegSaiFileResult">
@@ -32,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="devType != null "> and dev_type = #{devType}</if>
             <if test="createrDate != null "> and creater_date = #{createrDate}</if>
             <if test="createrCode != null "> and creater_code = #{createrCode}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -58,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createrDate != null">creater_date,</if>
             <if test="createrCode != null">creater_code,</if>
             <if test="remark != null">remark,</if>
-            <if test="deptId != null">dept_id,</if>
             <if test="delFlag != null">del_flag,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -70,7 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createrDate != null">#{createrDate},</if>
             <if test="createrCode != null">#{createrCode},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="deptId != null">#{deptId},</if>
             <if test="delFlag != null">#{delFlag},</if>
          </trim>
     </insert>
@@ -85,7 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createrDate != null">creater_date = #{createrDate},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
         </trim>
         where id = #{id}

master/src/main/resources/mybatis/production/TEoegSaiMapper.xml

@@ -19,14 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
-        <result property="deptName" column="dept_name" />
         <result property="saiApplyId"    column="sai_apply_id"    />
         <result property="applicant"    column="applicant"    />
     </resultMap>
 
     <sql id="selectTEoegSaiVo">
-        select d.sai_id, d.plant_id, d.inspection_date, d.dificiency, d.sai_level, d.category, d.actions, d.user_dept, d.source, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time ,d.dept_id, d.sai_apply_id, d.applicant, s.dept_name from t_eoeg_sai d
-      left join sys_dept s on s.dept_id = d.dept_id
+        select d.sai_id, d.plant_id, d.inspection_date, d.dificiency, d.sai_level, d.category, d.actions, d.user_dept, d.source, d.del_flag, d.create_by, d.create_time, d.update_by, d.update_time , d.sai_apply_id, d.applicant from t_eoeg_sai d
     </sql>
 
     <select id="selectTSaiListByYear" parameterType="com.ruoyi.project.production.controller.vo.SaiQueryVO" resultMap="TEoegSaiResult">
@@ -86,7 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-            <if test="deptId != null">dept_id,</if>
             <if test="saiApplyId != null">sai_apply_id,</if>
             <if test="applicant != null">applicant,</if>
          </trim>
@@ -105,7 +102,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-            <if test="deptId != null">#{deptId},</if>
             <if test="saiApplyId != null">#{saiApplyId},</if>
             <if test="applicant != null">#{applicant},</if>
          </trim>