新增成员数量查询

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/web/DeptController.java

@@ -10,6 +10,7 @@ import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.model.DeptTreeSelect;
 import com.mortals.xhx.module.dept.service.DeptService;
+import com.mortals.xhx.module.staff.service.StaffService;
 import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import com.mortals.xhx.module.workman.service.WorkmanService;
 import org.apache.commons.lang3.ArrayUtils;
@@ -39,6 +40,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
     private DeptService deptService;
     @Autowired
     private WorkmanService workmanService;
+    @Autowired
+    private StaffService staffService;
 
 
     public DeptController() {
@@ -49,7 +52,7 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "deptStatus", paramService.getParamBySecondOrganize("Dept", "deptStatus"));
         this.addDict(model, "id", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
-        this.addDict(model, "remark", workmanService.find(new WorkmanQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getName(),(o, n)->n)));
+        this.addDict(model, "id", workmanService.find(new WorkmanQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getName(),(o, n)->n)));
         super.init(model, context);
     }
 
@@ -129,6 +132,8 @@ public class DeptController extends BaseCRUDJsonBodyMappingController<DeptServic
 
     @Override
     protected int doListAfter(DeptEntity query, Map<String, Object> model, Context context) throws AppException {
+        int Allperson =staffService.queryAllPerson();
+        model.put("AllPerson",Allperson);
         return super.doListAfter(query, model, context);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/web/JobController.java

 package com.mortals.xhx.module.job.web;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.job.model.JobEntity;
+import com.mortals.xhx.module.job.service.JobService;
 import org.springframework.beans.factory.annotation.Autowired;
 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.job.model.JobEntity;
-import com.mortals.xhx.module.job.service.JobService;
-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.*;
 /**
 *
 * 职位信息
@@ -43,6 +31,7 @@ public class JobController extends BaseCRUDJsonBodyMappingController<JobService,
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "type", paramService.getParamBySecondOrganize("Job", "type"));
         super.init(model, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/StaffDao.java

@@ -53,7 +53,9 @@ public interface  StaffDao extends ICRUDDao<StaffEntity,Long>{
     int queryConcurrently();
 
     /**
-     * 查询职位
+     * 统计部门
      * */
-    List<StaffEntity> queryDetp();
+    int queryPersonNum(Long deptId);
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/dao/ibatis/StaffDaoImpl.java

@@ -54,8 +54,8 @@ public class StaffDaoImpl extends BaseCRUDDaoMybatis<StaffEntity,Long> implement
     }
 
     @Override
-    public List<StaffEntity> queryDetp(){
-        return this.getSqlSession().selectList(this.getSqlId("queryDetp"));
+    public int queryPersonNum(Long deptId) {
+        return this.getSqlSession().selectOne(this.getSqlId("queryPersonNum"),deptId);
     }
 
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffVo.java

@@ -17,4 +17,6 @@ public class StaffVo extends BaseEntityLong {
     private List<HolidayListVo> holidayLists;
 
     private List<StaffInfoVo>staffInfoVos;
+
+    private Integer personNum;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java

@@ -3,8 +3,6 @@ import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
 
-import java.util.List;
-
 /**
 * StaffService
 *
@@ -17,5 +15,7 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
 
     StaffInfoVo queryAll();
 
-    List<StaffEntity> queryDept();
+    int queryDeptNum(Long deptId);
+
+    int queryAllPerson();
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -10,8 +10,6 @@ import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * StaffService
  * 员工基本信息 service实现
@@ -57,8 +55,14 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
     }
 
     @Override
-    public List<StaffEntity> queryDept() {
+    public int queryDeptNum(Long deptId) {
+        return staffDao.queryPersonNum(deptId);
+    }
 
-        return staffDao.queryDetp();
+    @Override
+    public int queryAllPerson() {
+        return staffDao.queryInWork();
     }
+
+
 }
\ No newline at end of file

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

@@ -4,6 +4,8 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.job.model.JobQuery;
 import com.mortals.xhx.module.job.service.JobService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
@@ -35,6 +37,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
     private ParamService paramService;
     @Autowired
     private JobService jobService;
+    @Autowired
+    private DeptService deptService;
 
     public StaffController(){
         super.setModuleDesc( "员工基本信息");
@@ -100,7 +104,10 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
 
     @Override
     protected int saveAfter(StaffEntity entity, Map<String, Object> model, Context context) throws AppException {
-
+        int personNum = service.queryDeptNum(entity.getDeptId());
+        DeptEntity deptEntity = deptService.get(entity.getDeptId());
+        deptEntity.setPersonNum(personNum);
+        deptService.update(deptEntity);
         return super.saveAfter(entity, model, context);
     }
 

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

@@ -47,7 +47,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     @Override
     protected int saveAfter(WorkmanEntity entity, Map<String, Object> model, Context context) throws AppException {
         DeptEntity deptEntity = new DeptEntity();
-        deptEntity.setRemark(entity.getName());
+        deptEntity.setWorkName(entity.getName());
         return super.saveAfter(entity, model, context);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffMapper.xml

@@ -1337,7 +1337,8 @@
         select count(1) pricateStaff from mortals_xhx_staff where staffType = 3
     </select>
 
-    <select id="queryDetp" resultType="com.mortals.xhx.module.staff.model.StaffEntity">
-        select deptName from mortals_xhx_staff group by deptName
+    <select id="queryPersonNum" resultType="integer">
+        select count(1) personNum from mortals_xhx_staff where deptId = #{deptId}
     </select>
+
 </mapper>
\ No newline at end of file