优化代码

java110-bean/src/main/java/com/java110/po/attendanceClassesTask/AttendanceClassesTaskPo.java

@@ -14,6 +14,8 @@ public class AttendanceClassesTaskPo implements Serializable {
     private String taskId;
     private String staffId;
 
+    private String staffName;
+
     public String getClassId() {
         return classId;
     }
@@ -86,5 +88,11 @@ public class AttendanceClassesTaskPo implements Serializable {
         this.staffId = staffId;
     }
 
+    public String getStaffName() {
+        return staffName;
+    }
 
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }

java110-db/src/main/resources/mapper/common/AttendanceClassesTaskServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存考勤任务信息 add by wuxw 2018-07-03 -->
     <insert id="saveAttendanceClassesTaskInfo" parameterType="Map">
         insert into attendance_classes_task(
-        class_id,task_month,task_day,state,store_id,task_year,task_id,staff_id
+        class_id,task_month,task_day,state,store_id,task_year,task_id,staff_id,staff_name
         ) values (
-        #{classId},#{taskMonth},#{taskDay},#{state},#{storeId},#{taskYear},#{taskId},#{staffId}
+        #{classId},#{taskMonth},#{taskDay},#{state},#{storeId},#{taskYear},#{taskId},#{staffId},#{staffName}
         )
     </insert>
 
@@ -19,7 +19,7 @@
     <select id="getAttendanceClassesTaskInfo" parameterType="Map" resultType="Map">
         select t.class_id,t.class_id classId,t.task_month,t.task_month taskMonth,t.task_day,t.task_day
         taskDay,t.status_cd,t.status_cd statusCd,t.state,t.store_id,t.store_id storeId,t.task_year,t.task_year
-        taskYear,t.task_id,t.task_id taskId,t.staff_id,t.staff_id staffId,ac.classes_name classesName,ac.classes_obj_name classObjName,
+        taskYear,t.task_id,t.task_id taskId,t.staff_id,t.staff_id staffId,t.staff_name,t.staff_name staffName,ac.classes_name classesName,ac.classes_obj_name classObjName,
         td.name stateName
         from attendance_classes_task t
         LEFT JOIN attendance_classes ac on t.class_id = ac.classes_id and ac.status_cd = '0'
@@ -52,6 +52,9 @@
         <if test="staffId !=null and staffId != ''">
             and t.staff_id= #{staffId}
         </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name like concat('%',#{staffName},'%')
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -87,6 +90,9 @@
         <if test="staffId !=null and staffId != ''">
             , t.staff_id= #{staffId}
         </if>
+        <if test="staffName !=null and staffName != ''">
+            , t.staff_name= #{staffName}
+        </if>
         where 1=1
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
@@ -126,6 +132,9 @@
         <if test="staffId !=null and staffId != ''">
             and t.staff_id= #{staffId}
         </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name like concat('%',#{staffName},'%')
+        </if>
 
 
     </select>

service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java

@@ -166,12 +166,14 @@ public class AttendanceClassApi {
                                                              @RequestParam(value = "row") int row,
                                                              @RequestParam(value = "classId", required = false) String classId,
                                                              @RequestParam(value = "staffId", required = false) String staffId,
+                                                             @RequestParam(value = "staffName", required = false) String staffName,
                                                              @RequestParam(name = "date", required = false) String date) throws Exception {
         AttendanceClassesTaskDto attendanceClassesTaskDto = new AttendanceClassesTaskDto();
         attendanceClassesTaskDto.setPage(page);
         attendanceClassesTaskDto.setRow(row);
         attendanceClassesTaskDto.setStoreId(storeId);
         attendanceClassesTaskDto.setClassId(classId);
+        attendanceClassesTaskDto.setStaffName(staffName);
         if (!StringUtil.isEmpty(date)) {
             Date reqDate = DateUtil.getDateFromString(date, DateUtil.DATE_FORMATE_STRING_B);
 

service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/SaveAttendanceClassesTaskBMOImpl.java

@@ -3,9 +3,11 @@ package com.java110.common.bmo.attendanceClassesTask.impl;
 import com.java110.common.bmo.attendanceClassesTask.ISaveAttendanceClassesTaskBMO;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.attendanceClasses.AttendanceClassesDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.common.IAttendanceClassesInnerServiceSMO;
 import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
 import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
 import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
 import com.java110.utils.util.Assert;
@@ -27,6 +29,9 @@ public class SaveAttendanceClassesTaskBMOImpl implements ISaveAttendanceClassesT
     @Autowired
     private IAttendanceClassesInnerServiceSMO attendanceClassesInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     /**
      * 添加小区信息
      *
@@ -46,6 +51,18 @@ public class SaveAttendanceClassesTaskBMOImpl implements ISaveAttendanceClassesT
         Assert.listOnlyOne(attendanceClassesDtos, "班组不存在");
 
         attendanceClassesTaskPo.setStoreId(attendanceClassesDtos.get(0).getStoreId());
+
+        //查询员工信息
+        UserDto userDto = new UserDto();
+        userDto.setUserId(attendanceClassesTaskPo.getStaffId());
+        userDto.setPage(1);
+        userDto.setRow(1);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"未包含员工");
+
+        attendanceClassesTaskPo.setStaffName(userDtos.get(0).getName());
+
         int flag = attendanceClassesTaskInnerServiceSMOImpl.saveAttendanceClassesTask(attendanceClassesTaskPo);
 
         for (AttendanceClassesTaskDetailPo attendanceClassesTaskDetailPo : attendanceClassesTaskDetailPos) {