优化查询排班

java110-bean/src/main/java/com/java110/dto/scheduleClasses/ScheduleClassesDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.scheduleClasses;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,13 +16,17 @@ import java.util.Date;
 public class ScheduleClassesDto extends PageDto implements Serializable {
 
     private String scheduleType;
-private String scheduleCycle;
-private String computeTime;
-private String name;
-private String remark;
-private String state;
-private String storeId;
-private String scheduleId;
+    private String scheduleTypeName;
+    private String scheduleCycle;
+    private String computeTime;
+    private String name;
+    private String nameLike;
+    private String remark;
+    private String state;
+    private String stateName;
+    private String storeId;
+    private String scheduleId;
+    private long staffCount;
 
 
     private Date createTime;
@@ -32,49 +37,64 @@ private String scheduleId;
     public String getScheduleType() {
         return scheduleType;
     }
-public void setScheduleType(String scheduleType) {
+
+    public void setScheduleType(String scheduleType) {
         this.scheduleType = scheduleType;
     }
-public String getScheduleCycle() {
+
+    public String getScheduleCycle() {
         return scheduleCycle;
     }
-public void setScheduleCycle(String scheduleCycle) {
+
+    public void setScheduleCycle(String scheduleCycle) {
         this.scheduleCycle = scheduleCycle;
     }
-public String getComputeTime() {
+
+    public String getComputeTime() {
         return computeTime;
     }
-public void setComputeTime(String computeTime) {
+
+    public void setComputeTime(String computeTime) {
         this.computeTime = computeTime;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getScheduleId() {
+
+    public String getScheduleId() {
         return scheduleId;
     }
-public void setScheduleId(String scheduleId) {
+
+    public void setScheduleId(String scheduleId) {
         this.scheduleId = scheduleId;
     }
 
@@ -94,4 +114,36 @@ public void setScheduleId(String scheduleId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getScheduleTypeName() {
+        return scheduleTypeName;
+    }
+
+    public void setScheduleTypeName(String scheduleTypeName) {
+        this.scheduleTypeName = scheduleTypeName;
+    }
+
+    public String getNameLike() {
+        return nameLike;
+    }
+
+    public void setNameLike(String nameLike) {
+        this.nameLike = nameLike;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public long getStaffCount() {
+        return staffCount;
+    }
+
+    public void setStaffCount(long staffCount) {
+        this.staffCount = staffCount;
+    }
 }

java110-bean/src/main/java/com/java110/dto/scheduleClassesStaff/ScheduleClassesStaffDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.scheduleClassesStaff;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,13 @@ import java.util.Date;
 public class ScheduleClassesStaffDto extends PageDto implements Serializable {
 
     private String staffName;
-private String storeId;
-private String scsId;
-private String scheduleId;
-private String staffId;
+    private String storeId;
+    private String scsId;
+    private String scheduleId;
+    private String[] scheduleIds;
+    private String staffId;
+
+    private long staffCount;
 
 
     private Date createTime;
@@ -29,31 +33,40 @@ private String staffId;
     public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getScsId() {
+
+    public String getScsId() {
         return scsId;
     }
-public void setScsId(String scsId) {
+
+    public void setScsId(String scsId) {
         this.scsId = scsId;
     }
-public String getScheduleId() {
+
+    public String getScheduleId() {
         return scheduleId;
     }
-public void setScheduleId(String scheduleId) {
+
+    public void setScheduleId(String scheduleId) {
         this.scheduleId = scheduleId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
 
@@ -73,4 +86,20 @@ public void setStaffId(String staffId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getScheduleIds() {
+        return scheduleIds;
+    }
+
+    public void setScheduleIds(String[] scheduleIds) {
+        this.scheduleIds = scheduleIds;
+    }
+
+    public long getStaffCount() {
+        return staffCount;
+    }
+
+    public void setStaffCount(long staffCount) {
+        this.staffCount = staffCount;
+    }
 }

java110-db/src/main/resources/mapper/store/ScheduleClassesStaffV1ServiceDaoImplMapper.xml

@@ -5,102 +5,123 @@
 <mapper namespace="scheduleClassesStaffV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存排班员工信息 add by wuxw 2018-07-03 -->
     <insert id="saveScheduleClassesStaffInfo" parameterType="Map">
         insert into schedule_classes_staff(
-staff_name,store_id,scs_id,schedule_id,staff_id
-) values (
-#{staffName},#{storeId},#{scsId},#{scheduleId},#{staffId}
-)
+        staff_name,store_id,scs_id,schedule_id,staff_id
+        ) values (
+        #{staffName},#{storeId},#{scsId},#{scheduleId},#{staffId}
+        )
     </insert>
 
 
-
     <!-- 查询排班员工信息 add by wuxw 2018-07-03 -->
     <select id="getScheduleClassesStaffInfo" parameterType="Map" resultType="Map">
-        select  t.staff_name,t.staff_name staffName,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.scs_id,t.scs_id scsId,t.schedule_id,t.schedule_id scheduleId,t.staff_id,t.staff_id staffId 
-from schedule_classes_staff t 
-where 1 =1 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="scsId !=null and scsId != ''">
-   and t.scs_id= #{scsId}
-</if> 
-<if test="scheduleId !=null and scheduleId != ''">
-   and t.schedule_id= #{scheduleId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.staff_name,t.staff_name staffName,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id
+        storeId,t.scs_id,t.scs_id scsId,t.schedule_id,t.schedule_id scheduleId,t.staff_id,t.staff_id staffId
+        from schedule_classes_staff t
+        where 1 =1
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="scsId !=null and scsId != ''">
+            and t.scs_id= #{scsId}
+        </if>
+        <if test="scheduleId !=null and scheduleId != ''">
+            and t.schedule_id= #{scheduleId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改排班员工信息 add by wuxw 2018-07-03 -->
     <update id="updateScheduleClassesStaffInfo" parameterType="Map">
-        update  schedule_classes_staff t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-, t.staff_name= #{staffName}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="scheduleId !=null and scheduleId != ''">
-, t.schedule_id= #{scheduleId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
- where 1=1 <if test="scsId !=null and scsId != ''">
-and t.scs_id= #{scsId}
-</if> 
+        update schedule_classes_staff t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            , t.staff_name= #{staffName}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="scheduleId !=null and scheduleId != ''">
+            , t.schedule_id= #{scheduleId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        where 1=1
+        <if test="scsId !=null and scsId != ''">
+            and t.scs_id= #{scsId}
+        </if>
 
     </update>
 
     <!-- 查询排班员工数量 add by wuxw 2018-07-03 -->
-     <select id="queryScheduleClassesStaffsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from schedule_classes_staff t 
-where 1 =1 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="scsId !=null and scsId != ''">
-   and t.scs_id= #{scsId}
-</if> 
-<if test="scheduleId !=null and scheduleId != ''">
-   and t.schedule_id= #{scheduleId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
+    <select id="queryScheduleClassesStaffsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from schedule_classes_staff t
+        where 1 =1
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="scsId !=null and scsId != ''">
+            and t.scs_id= #{scsId}
+        </if>
+        <if test="scheduleId !=null and scheduleId != ''">
+            and t.schedule_id= #{scheduleId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
 
 
-     </select>
+    </select>
+
+    <!-- 查询排班员工信息 add by wuxw 2018-07-03 -->
+    <select id="getGroupScheduleClassesStaffInfo" parameterType="Map" resultType="Map">
+        select t.schedule_id scheduleId,count(1) staffCount
+        from schedule_classes_staff t
+        where 1 =1
+            and t.status_cd= '0'
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="scsId !=null and scsId != ''">
+            and t.scs_id= #{scsId}
+        </if>
+        <if test="scheduleId !=null and scheduleId != ''">
+            and t.schedule_id= #{scheduleId}
+        </if>
+        <if test="scheduleIds !=null ">
+            and t.schedule_id in
+            <foreach collection="scheduleIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        group by t.schedule_id
+
+    </select>
 
 </mapper>

java110-db/src/main/resources/mapper/store/ScheduleClassesV1ServiceDaoImplMapper.xml

@@ -19,8 +19,11 @@
     <select id="getScheduleClassesInfo" parameterType="Map" resultType="Map">
         select t.schedule_type,t.schedule_type scheduleType,t.schedule_cycle,t.schedule_cycle
         scheduleCycle,t.compute_time,t.compute_time computeTime,t.name,t.remark,t.status_cd,t.status_cd
-        statusCd,t.state,t.store_id,t.store_id storeId,t.schedule_id,t.schedule_id scheduleId
+        statusCd,t.state,t.store_id,t.store_id storeId,t.schedule_id,t.schedule_id scheduleId,
+        td.name scheduleTypeName,td1.name stateName
         from schedule_classes t
+        left join t_dict td on t.schedule_type =  td.status_cd and td.table_name = 'schedule_classes' and td.table_columns = 'schedule_type'
+        left join t_dict td1 on t.state =  td1.status_cd and td1.table_name = 'schedule_classes' and td1.table_columns = 'state'
         where 1 =1
         <if test="scheduleType !=null and scheduleType != ''">
             and t.schedule_type= #{scheduleType}
@@ -34,6 +37,9 @@
         <if test="name !=null and name != ''">
             and t.name= #{name}
         </if>
+        <if test="nameLike !=null and nameLike != ''">
+            and t.name like concat('%',#{name},'%')
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
@@ -108,6 +114,9 @@
         <if test="name !=null and name != ''">
             and t.name= #{name}
         </if>
+        <if test="nameLike !=null and nameLike != ''">
+            and t.name like concat('%',#{name},'%')
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>

java110-interface/src/main/java/com/java110/intf/store/IScheduleClassesStaffV1InnerServiceSMO.java

@@ -65,4 +65,8 @@ public interface IScheduleClassesStaffV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryScheduleClassesStaffsCount", method = RequestMethod.POST)
     int queryScheduleClassesStaffsCount(@RequestBody ScheduleClassesStaffDto scheduleClassesStaffDto);
+
+
+    @RequestMapping(value = "/queryGroupScheduleClassesStaffs", method = RequestMethod.POST)
+    List<ScheduleClassesStaffDto> queryGroupScheduleClassesStaffs(@RequestBody ScheduleClassesStaffDto scheduleClassesStaffDto);
 }

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/ListScheduleClassesCmd.java

@@ -22,6 +22,8 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.scheduleClassesStaff.ScheduleClassesStaffDto;
+import com.java110.intf.store.IScheduleClassesStaffV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesV1InnerServiceSMO;
 import com.java110.po.scheduleClasses.ScheduleClassesPo;
 import com.java110.utils.exception.CmdException;
@@ -30,8 +32,10 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.scheduleClasses.ScheduleClassesDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,10 +55,13 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "scheduleClasses.listScheduleClasses")
 public class ListScheduleClassesCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListScheduleClassesCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListScheduleClassesCmd.class);
     @Autowired
     private IScheduleClassesV1InnerServiceSMO scheduleClassesV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IScheduleClassesStaffV1InnerServiceSMO scheduleClassesStaffV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -63,22 +70,56 @@ public class ListScheduleClassesCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           ScheduleClassesDto scheduleClassesDto = BeanConvertUtil.covertBean(reqJson, ScheduleClassesDto.class);
+        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+
+        ScheduleClassesDto scheduleClassesDto = BeanConvertUtil.covertBean(reqJson, ScheduleClassesDto.class);
+        scheduleClassesDto.setStoreId(storeId);
+
+        int count = scheduleClassesV1InnerServiceSMOImpl.queryScheduleClassessCount(scheduleClassesDto);
+
+        List<ScheduleClassesDto> scheduleClassesDtos = null;
+
+        if (count > 0) {
+            scheduleClassesDtos = scheduleClassesV1InnerServiceSMOImpl.queryScheduleClassess(scheduleClassesDto);
+
+            freshScheduleClassesStaff(scheduleClassesDtos);
+        } else {
+            scheduleClassesDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, scheduleClassesDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
 
-           int count = scheduleClassesV1InnerServiceSMOImpl.queryScheduleClassessCount(scheduleClassesDto);
+    /**
+     * 刷入员工数量
+     * @param scheduleClassesDtos
+     */
+    private void freshScheduleClassesStaff(List<ScheduleClassesDto> scheduleClassesDtos) {
+        if(scheduleClassesDtos == null || scheduleClassesDtos.size()< 1){
+            return ;
+        }
 
-           List<ScheduleClassesDto> scheduleClassesDtos = null;
+        List<String> scheduleIds = new ArrayList<>();
 
-           if (count > 0) {
-               scheduleClassesDtos = scheduleClassesV1InnerServiceSMOImpl.queryScheduleClassess(scheduleClassesDto);
-           } else {
-               scheduleClassesDtos = new ArrayList<>();
-           }
+        for(ScheduleClassesDto scheduleClassesDto : scheduleClassesDtos){
+            scheduleIds.add(scheduleClassesDto.getScheduleId());
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, scheduleClassesDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ScheduleClassesStaffDto  scheduleClassesStaffDto = new ScheduleClassesStaffDto();
+        scheduleClassesStaffDto.setScheduleIds(scheduleIds.toArray(new String[scheduleIds.size()]));
+        List<ScheduleClassesStaffDto> scheduleClassesStaffDtos = scheduleClassesStaffV1InnerServiceSMOImpl.queryGroupScheduleClassesStaffs(scheduleClassesStaffDto);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        for(ScheduleClassesDto scheduleClassesDto : scheduleClassesDtos){
+            for(ScheduleClassesStaffDto scheduleClassesStaffDto1 : scheduleClassesStaffDtos){
+                if(scheduleClassesDto.getScheduleId().equals(scheduleClassesStaffDto1.getScheduleId())){
+                    scheduleClassesDto.setStaffCount(scheduleClassesStaffDto1.getStaffCount());
+                }
+            }
+        }
     }
 }

service-store/src/main/java/com/java110/store/dao/IScheduleClassesStaffV1ServiceDao.java

@@ -74,4 +74,16 @@ public interface IScheduleClassesStaffV1ServiceDao {
      */
     int queryScheduleClassesStaffsCount(Map info);
 
+
+
+    /**
+     * 查询排班员工信息（instance过程）
+     * 根据bId 查询排班员工信息
+     * @param info bId 信息
+     * @return 排班员工信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getGroupScheduleClassesStaffInfo(Map info) throws DAOException;
+
+
 }

service-store/src/main/java/com/java110/store/dao/impl/ScheduleClassesStaffV1ServiceDaoImpl.java

@@ -108,5 +108,19 @@ public class ScheduleClassesStaffV1ServiceDaoImpl extends BaseServiceDao impleme
         return Integer.parseInt(businessScheduleClassesStaffInfos.get(0).get("count").toString());
     }
 
+    /**
+     * 查询排班员工信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getGroupScheduleClassesStaffInfo(Map info) throws DAOException {
+        logger.debug("查询 getGroupScheduleClassesStaffInfo 入参 info : {}",info);
+
+        List<Map> businessScheduleClassesStaffInfos = sqlSessionTemplate.selectList("scheduleClassesStaffV1ServiceDaoImpl.getGroupScheduleClassesStaffInfo",info);
+
+        return businessScheduleClassesStaffInfos;
+    }
 
 }

service-store/src/main/java/com/java110/store/smo/impl/ScheduleClassesStaffV1InnerServiceSMOImpl.java

@@ -86,4 +86,19 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
     public int queryScheduleClassesStaffsCount(@RequestBody ScheduleClassesStaffDto scheduleClassesStaffDto) {
         return scheduleClassesStaffV1ServiceDaoImpl.queryScheduleClassesStaffsCount(BeanConvertUtil.beanCovertMap(scheduleClassesStaffDto));    }
 
+    @Override
+    public List<ScheduleClassesStaffDto> queryGroupScheduleClassesStaffs(@RequestBody  ScheduleClassesStaffDto scheduleClassesStaffDto) {
+
+        //校验是否传了 分页信息
+
+        int page = scheduleClassesStaffDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            scheduleClassesStaffDto.setPage((page - 1) * scheduleClassesStaffDto.getRow());
+        }
+
+        List<ScheduleClassesStaffDto> scheduleClassesStaffs = BeanConvertUtil.covertBeanList(scheduleClassesStaffV1ServiceDaoImpl.getGroupScheduleClassesStaffInfo(BeanConvertUtil.beanCovertMap(scheduleClassesStaffDto)), ScheduleClassesStaffDto.class);
+
+        return scheduleClassesStaffs;
+    }
 }