修改核查状态

attendance-performance-manager-ui/admin/src/views/window/owner/drawershow.vue

@@ -9,17 +9,13 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <Field
-          label="部门id号"
+          label="部门"
           prop="deptId"
+          type="select"
           v-model="form.deptId"
           placeholder="请输入部门id号"
         />
-        <Field
-          label="部门名称"
-          prop="deptName"
-          v-model="form.deptName"
-          placeholder="请输入部门名称"
-        />
+
         <Field
           label="姓名"
           prop="name"

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowOwnerController.java

@@ -4,6 +4,8 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -47,6 +49,8 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
     private ParamService paramService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private DeptService deptService;
 
     public WindowOwnerController() {
         super.setModuleDesc("窗口负责人");
@@ -55,11 +59,10 @@ public class WindowOwnerController extends BaseCRUDJsonBodyMappingController<Win
     @Override
     protected void init(Map<String, Object> model, Context context) {
 
-
         Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
                 .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
-
         this.addDict(model, "updateUserId", collect);
+        this.addDict(model, "deptName", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
 
         super.init(model, context);
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -60,7 +60,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     @Override
     protected void saveBefore(WorkmanEntity entity, Map<String, Object> model, Context context) throws AppException {
 
-        if(ObjectUtils.isEmpty(entity.getDeptId())){
+        if(!ObjectUtils.isEmpty(entity.getDeptId())){
             DeptEntity deptEntity = deptService.get(entity.getDeptId(), context);
             entity.setDeptName(deptEntity==null?"":deptEntity.getDeptName());
         }