更改安全日报字段名

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

@@ -47,7 +47,7 @@ public class CmcSafeReportController extends BaseController
         startPage();
         List<CmcSafeReport> list = cmcSafeReportService.selectCmcSafeReportList(cmcSafeReport);
         for (CmcSafeReport safeReport : list) {
-            String userId = safeReport.getUserId();
+            String userId = safeReport.getMember();
             StringBuilder userName = new StringBuilder();
             if (userId != null && !userId.equals("") && userId.split(",").length > 0) {
                 for (String user : userId.split(","))
@@ -67,7 +67,7 @@ public class CmcSafeReportController extends BaseController
     {
         List<CmcSafeReport> list = cmcSafeReportService.selectCmcSafeReportList(cmcSafeReport);
         for (CmcSafeReport safeReport : list) {
-            String userId = safeReport.getUserId();
+            String userId = safeReport.getMember();
             StringBuilder userName = new StringBuilder();
             if (userId != null && !userId.equals("") && userId.split(",").length > 0) {
                 for (String user : userId.split(","))

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

@@ -19,7 +19,7 @@ public class CmcSafeReport extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 安全报告id */
-    private Long safeReportId;
+    private Integer safeReportId;
 
     /** 项目id */
     private String projectId;
@@ -30,7 +30,7 @@ public class CmcSafeReport extends BaseEntity
     private CmcProject project;
 
     /** 公司人员 */
-    private String userId;
+    private String member;
     @Excel(name = "公司人员")
     private String userNames;
 
@@ -53,12 +53,12 @@ public class CmcSafeReport extends BaseEntity
     @Excel(name = "报告日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date reportDate;
 
-    public void setSafeReportId(Long safeReportId)
+    public void setSafeReportId(Integer safeReportId)
     {
         this.safeReportId = safeReportId;
     }
 
-    public Long getSafeReportId()
+    public Integer getSafeReportId()
     {
         return safeReportId;
     }
@@ -91,14 +91,14 @@ public class CmcSafeReport extends BaseEntity
     {
         return reportDate;
     }
-    public void setUserId(String userId)
+    public void setMember(String member)
     {
-        this.userId = userId;
+        this.member = member;
     }
 
-    public String getUserId()
+    public String getMember()
     {
-        return userId;
+        return member;
     }
     public void setUserNames(String userNames)
     {
@@ -153,7 +153,7 @@ public class CmcSafeReport extends BaseEntity
                 .append("safeReportId", getSafeReportId())
                 .append("projectId", getProjectId())
                 .append("reportDate", getReportDate())
-                .append("userId", getUserId())
+                .append("member", getMember())
                 .append("employee", getEmployee())
                 .append("content", getContent())
                 .append("reporter", getReporter())

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

@@ -8,7 +8,7 @@
         <result property="safeReportId"    column="safe_report_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="reportDate"    column="report_date"    />
-        <result property="userId"    column="user_id"    />
+        <result property="member"    column="member"    />
         <result property="employee"    column="employee"    />
         <result property="content"    column="content"    />
         <result property="reporter"    column="reporter"    />
@@ -17,7 +17,7 @@
     </resultMap>
 
     <resultMap type="SysUser" id="ReportUserResult">
-        <result property="userId"    column="user_id"    />
+        <result property="member"    column="user_id"    />
         <result property="nickName"    column="nick_name"    />
     </resultMap>
 
@@ -28,7 +28,7 @@
     </resultMap>
 
     <sql id="selectCmcSafeReportVo">
-        select sr.safe_report_id, sr.project_id, p.project_number, p.project_name, sr.report_date, sr.user_id, sr.employee, sr.content, sr.reporter, u.nick_name from cmc_safe_report as sr
+        select sr.safe_report_id, sr.project_id, p.project_number, p.project_name, sr.report_date, sr.member, sr.employee, sr.content, sr.reporter, u.nick_name from cmc_safe_report as sr
         left join sys_user as u on sr.reporter = u.user_id
         left join cmc_project as p on sr.project_id = p.project_id
     </sql>
@@ -38,7 +38,7 @@
         <where>
             <if test="projectId != null  and projectId != ''"> and sr.project_id = #{projectId}</if>
             <if test="reportDate != null "> and sr.report_date = #{reportDate}</if>
-            <if test="userId != null  and userId != ''"> and find_in_set(sr.user_id, #{userId})</if>
+            <if test="member != null  and member != ''"> and sr.member like concat('%', #{member}, '%')</if>
             <if test="employee != null  and employee != ''"> and sr.employee like concat('%', #{employee}, '%')</if>
             <if test="content != null  and content != ''"> and sr.content = #{content}</if>
             <if test="reporter != null "> and sr.reporter = #{reporter}</if>
@@ -55,7 +55,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="projectId != null">project_id,</if>
             <if test="reportDate != null">report_date,</if>
-            <if test="userId != null">user_id,</if>
+            <if test="member != null">member,</if>
             <if test="employee != null">employee,</if>
             <if test="content != null">content,</if>
             <if test="reporter != null">reporter,</if>
@@ -63,7 +63,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
             <if test="reportDate != null">#{reportDate},</if>
-            <if test="userId != null">#{userId},</if>
+            <if test="member != null">#{member},</if>
             <if test="employee != null">#{employee},</if>
             <if test="content != null">#{content},</if>
             <if test="reporter != null">#{reporter},</if>
@@ -75,7 +75,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="reportDate != null">report_date = #{reportDate},</if>
-            <if test="userId != null">user_id = #{userId},</if>
+            <if test="member != null">member = #{member},</if>
             <if test="employee != null">employee = #{employee},</if>
             <if test="content != null">content = #{content},</if>
             <if test="reporter != null">reporter = #{reporter},</if>

oa-back/sql/sql.sql

@@ -12603,7 +12603,7 @@ create table `cmc_safe_report`  (
   `safe_report_id` 	int not null auto_increment		comment '安全报告id',
   `project_id` 		char(19) 		default null 	comment '项目id',
   `report_date` 	date 			default null 	comment '报告日期',
-  `user_id` 		varchar(100) 	default null 	comment '公司人员',
+  `member` 			varchar(100) 	default null 	comment '公司人员',
   `employee` 		varchar(255) 	default null 	comment '临时人员',
   `content` 		varchar(255) 	default null 	comment '安全报告',
   `reporter` 		bigint 			default null 	comment '填报人',

oa-ui/src/views/oa/safe/report.vue

@@ -14,9 +14,9 @@
           placeholder="请选择报告日期">
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="公司人员" prop="userId">
+      <!-- <el-form-item label="公司人员" prop="member">
         <el-input
-          v-model="queryParams.userId"
+          v-model="queryParams.member"
           placeholder="请输入公司人员"
           clearable
           @keyup.enter.native="handleQuery"
@@ -31,7 +31,11 @@
         />
       </el-form-item> -->
       <el-form-item label="填报人" prop="reporter">
-        <el-input v-model="queryParams.reporter" placeholder="请输入填报人" clearable @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.reporter" filterable clearable style="width:220px">
+            <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+              v-if="item.nickName != 'admin'">
+            </el-option>
+          </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -49,8 +53,8 @@
           v-hasPermi="['oa:report:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple && canDelete" @click="handleDelete"
-          v-hasPermi="['oa:report:remove']">删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple && canDelete"
+          @click="handleDelete" v-hasPermi="['oa:report:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -102,8 +106,8 @@
           <el-date-picker clearable v-model="form.reportDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择报告日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="公司人员" prop="userId">
-          <el-select v-model="form.userId" filterable multiple clearable style="width:380px">
+        <el-form-item label="公司人员" prop="member">
+          <el-select v-model="form.member" filterable multiple clearable style="width:380px">
             <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
               v-if="item.nickName != 'admin'">
             </el-option>
@@ -174,7 +178,7 @@ export default {
         pageSize: 10,
         projectId: null,
         reportDate: null,
-        userId: null,
+        member: null,
         employee: null,
         content: null,
         reporter: null
@@ -184,7 +188,7 @@ export default {
       // 表单校验
       rules: {
         projectId: [{ required: true, message: "项目编号不能为空", trigger: "blur" }],
-        userId: [{ required: true, message: "公司人员不能为空", trigger: "blur" }],
+        member: [{ required: true, message: "公司人员不能为空", trigger: "blur" }],
         reportDate: [{ required: true, message: "报告日期不能为空", trigger: "blur" }],
         content: [{ required: true, message: "安全汇报内容不能为空", trigger: "blur" }],
       }
@@ -199,18 +203,18 @@ export default {
     /** 查询安全汇报列表 */
     getList() {
       this.loading = true;
-      listSafeReport(this.queryParams).then(response => {        
+      listSafeReport(this.queryParams).then(response => {
         let rows = response.rows;
         for (let i = 0; i < rows.length; i++) {
-          if (rows[i].userId == null)
-            rows[i].userId = []
+          if (rows[i].member == null)
+            rows[i].member = []
           else {
             let arr = []
-            rows[i].userId = rows[i].userId.split(',');
-            for (let userId of rows[i].userId) {
-              arr.push(parseInt(userId))
+            rows[i].member = rows[i].member.split(',');
+            for (let member of rows[i].member) {
+              arr.push(parseInt(member))
             }
-            rows[i].userId = arr
+            rows[i].member = arr
           }
         }
         this.safeReportList = rows;
@@ -255,7 +259,7 @@ export default {
         safeReportId: null,
         projectId: null,
         reportDate: null,
-        userId: null,
+        member: null,
         employee: null,
         content: null,
         reporter: null
@@ -289,11 +293,13 @@ export default {
       this.reset();
       const safeReportId = row.safeReportId || this.ids
       getSafeReport(safeReportId).then(response => {
-        if (response.data.userId != null && response.data.userId != '') {
-          let userIds = [];
-          for (let i = 0; i < response.data.userId.split(',').length; i++)
-            userIds[i] = userId;
-          this.$set(this.form, "userId", userIds);
+        if (response.data.member != null && response.data.member != '') {
+          let arr = []
+          response.data.member = response.data.member.split(',');
+          for (let member of response.data.member) {
+            arr.push(parseInt(member))
+          }
+          response.data.member = arr
         }
         this.form = response.data;
         this.open = true;
@@ -305,11 +311,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.form.reporter = this.$store.getters.userId;
-          if (this.form.userId != "" && this.form.userId != undefined && this.form.userId != null)
-            this.form.userId = this.form.userId.join(',');
-          else
-            this.form.userId = undefined;
-          console.log(this.form);
+          this.form.member = this.form.member.join(',');
           if (this.form.safeReportId != null) {
             updateSafeReport(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");