修改考勤自动审核

attendance-performance-manager-ui/admin/src/views/staff/care/drawershow.vue

@@ -7,16 +7,13 @@
             size="50%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                                            <Field label="员工姓名" prop="staffName" v-model="form.staffName" placeholder="请输入员工姓名"/>
+                            <Field label="员工姓名" prop="staffName" v-model="form.staffId" type="select" :enumData="dict.staffId" placeholder="请输入员工姓名"/>
                             <Field label="出生日期" prop="birthday" v-model="form.birthday" type="date" />
-                            <Field label="所属部门" prop="deptId" v-model="form.deptId" placeholder="请输入所属部门"/>
-                            <Field label="所属部门名称" prop="deptName" v-model="form.deptName" placeholder="请输入所属部门名称"/>
-                            <Field label="职位ID" prop="jobId" v-model="form.jobId" placeholder="请输入职位ID"/>
-                            <Field label="职位名称" prop="jobName" v-model="form.jobName" placeholder="请输入职位名称"/>
+                            <Field label="所属部门" prop="deptId" v-model="form.deptId" type="select" :enumData="dict.deptId" placeholder="请输入所属部门"/>
+                             <Field label="职位ID" prop="jobId" v-model="form.jobId" type="select" :enumData="dict.jobId" placeholder="请输入职位ID"/>
                             <Field label="入职时间" prop="entryDate" v-model="form.entryDate" type="date" />
                             <Field label="关怀类型" prop="careType" v-model="form.careType" type="select" :enumData="dict.careType" placeholder="请选择关怀类型"/>
-                            <Field label="发送状态" prop="sendStatus" v-model="form.sendStatus" type="select" :enumData="dict.sendStatus" placeholder="请选择发送状态"/>
-                            <Field label="关怀内容"><editor v-model="form.content" :min-height="256"/></Field>
+                            <Field label="关怀内容" prop="content" v-model="form.content" type="textarea"></Field>
 
             </el-row>
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffCareController.java

 package com.mortals.xhx.module.staff.web;
+
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CareTypeEnum;
+import com.mortals.xhx.common.code.SendStatusEnum;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
+import com.mortals.xhx.module.job.model.JobEntity;
+import com.mortals.xhx.module.job.model.JobQuery;
+import com.mortals.xhx.module.job.service.JobService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.staff.model.StaffCareEntity;
 import com.mortals.xhx.module.staff.service.StaffCareService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 员工关怀信息
-*
-* @author zxfei
-* @date 2023-04-07
-*/
+ * 员工关怀信息
+ *
+ * @author zxfei
+ * @date 2023-04-07
+ */
 @RestController
 @RequestMapping("staff/care")
-public class StaffCareController extends BaseCRUDJsonBodyMappingController<StaffCareService,StaffCareEntity,Long> {
+public class StaffCareController extends BaseCRUDJsonBodyMappingController<StaffCareService, StaffCareEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public StaffCareController(){
-        super.setModuleDesc( "员工关怀信息");
+    @Autowired
+    private StaffService staffService;
+    @Autowired
+    private DeptService deptService;
+    @Autowired
+    private JobService jobService;
+
+    public StaffCareController() {
+        super.setModuleDesc("员工关怀信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "careType", paramService.getParamBySecondOrganize("StaffCare","careType"));
-        this.addDict(model, "sendStatus", paramService.getParamBySecondOrganize("StaffCare","sendStatus"));
+        this.addDict(model, "careType", CareTypeEnum.getEnumMap());
+        this.addDict(model, "sendStatus", SendStatusEnum.getEnumMap());
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName())));
+        this.addDict(model, "jobId", jobService.find(new JobQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getJobName())));
+        this.addDict(model, "staffId", staffService.find(new StaffQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getName())));
+
         super.init(model, context);
     }
 
 
+    @Override
+    protected void saveBefore(StaffCareEntity entity, Map<String, Object> model, Context context) throws AppException {
+        if (!ObjectUtils.isEmpty(entity.getJobId())) {
+            JobEntity jobEntity = jobService.get(entity.getJobId(), context);
+            entity.setJobName(jobEntity == null ? "" : jobEntity.getJobName());
+        }
+
+        if (!ObjectUtils.isEmpty(entity.getStaffId())) {
+            StaffEntity staffEntity = staffService.getCache(entity.getStaffId().toString());
+            entity.setStaffName(staffEntity == null ? "" : staffEntity.getName());
+        }
+        if (!ObjectUtils.isEmpty(entity.getDeptId())) {
+            DeptEntity deptEntity = deptService.get(entity.getDeptId(), context);
+            entity.setDeptName(deptEntity == null ? "" : deptEntity.getDeptName());
+        }
+
+    }
 }
\ No newline at end of file