优化保养计划添加功能

java110-bean/src/main/java/com/java110/dto/maintainancePlan/MaintainancePlanDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainancePlan;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,19 +16,24 @@ import java.util.Date;
 public class MaintainancePlanDto extends PageDto implements Serializable {
 
     private String maintainanceDay;
-private String planPeriod;
-private String createUserId;
-private String endDate;
-private String standardId;
-private String planName;
-private String remark;
-private String createUserName;
-private String maintainanceEveryday;
-private String maintainanceMonth;
-private String planId;
-private String state;
-private String communityId;
-private String startDate;
+    private String planPeriod;
+    private String planPeriodName;
+    private String createUserId;
+    private String endDate;
+    private String standardId;
+    private String standardName;
+    private String planName;
+    private String remark;
+    private String createUserName;
+    private String maintainanceEveryday;
+    private String maintainanceMonth;
+    private String planId;
+    private String state;
+    private String stateName;
+    private String communityId;
+    private String startDate;
+    private long machineCount;
+    private long staffCount;
 
 
     private Date createTime;
@@ -38,85 +44,112 @@ private String startDate;
     public String getMaintainanceDay() {
         return maintainanceDay;
     }
-public void setMaintainanceDay(String maintainanceDay) {
+
+    public void setMaintainanceDay(String maintainanceDay) {
         this.maintainanceDay = maintainanceDay;
     }
-public String getPlanPeriod() {
+
+    public String getPlanPeriod() {
         return planPeriod;
     }
-public void setPlanPeriod(String planPeriod) {
+
+    public void setPlanPeriod(String planPeriod) {
         this.planPeriod = planPeriod;
     }
-public String getCreateUserId() {
+
+    public String getCreateUserId() {
         return createUserId;
     }
-public void setCreateUserId(String createUserId) {
+
+    public void setCreateUserId(String createUserId) {
         this.createUserId = createUserId;
     }
-public String getEndDate() {
+
+    public String getEndDate() {
         return endDate;
     }
-public void setEndDate(String endDate) {
+
+    public void setEndDate(String endDate) {
         this.endDate = endDate;
     }
-public String getStandardId() {
+
+    public String getStandardId() {
         return standardId;
     }
-public void setStandardId(String standardId) {
+
+    public void setStandardId(String standardId) {
         this.standardId = standardId;
     }
-public String getPlanName() {
+
+    public String getPlanName() {
         return planName;
     }
-public void setPlanName(String planName) {
+
+    public void setPlanName(String planName) {
         this.planName = planName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCreateUserName() {
+
+    public String getCreateUserName() {
         return createUserName;
     }
-public void setCreateUserName(String createUserName) {
+
+    public void setCreateUserName(String createUserName) {
         this.createUserName = createUserName;
     }
-public String getMaintainanceEveryday() {
+
+    public String getMaintainanceEveryday() {
         return maintainanceEveryday;
     }
-public void setMaintainanceEveryday(String maintainanceEveryday) {
+
+    public void setMaintainanceEveryday(String maintainanceEveryday) {
         this.maintainanceEveryday = maintainanceEveryday;
     }
-public String getMaintainanceMonth() {
+
+    public String getMaintainanceMonth() {
         return maintainanceMonth;
     }
-public void setMaintainanceMonth(String maintainanceMonth) {
+
+    public void setMaintainanceMonth(String maintainanceMonth) {
         this.maintainanceMonth = maintainanceMonth;
     }
-public String getPlanId() {
+
+    public String getPlanId() {
         return planId;
     }
-public void setPlanId(String planId) {
+
+    public void setPlanId(String planId) {
         this.planId = planId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStartDate() {
+
+    public String getStartDate() {
         return startDate;
     }
-public void setStartDate(String startDate) {
+
+    public void setStartDate(String startDate) {
         this.startDate = startDate;
     }
 
@@ -136,4 +169,44 @@ public void setStartDate(String startDate) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPlanPeriodName() {
+        return planPeriodName;
+    }
+
+    public void setPlanPeriodName(String planPeriodName) {
+        this.planPeriodName = planPeriodName;
+    }
+
+    public String getStandardName() {
+        return standardName;
+    }
+
+    public void setStandardName(String standardName) {
+        this.standardName = standardName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public long getMachineCount() {
+        return machineCount;
+    }
+
+    public void setMachineCount(long machineCount) {
+        this.machineCount = machineCount;
+    }
+
+    public long getStaffCount() {
+        return staffCount;
+    }
+
+    public void setStaffCount(long staffCount) {
+        this.staffCount = staffCount;
+    }
 }

java110-bean/src/main/java/com/java110/dto/maintainancePlanMachine/MaintainancePlanMachineDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainancePlanMachine;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,13 @@ import java.util.Date;
 public class MaintainancePlanMachineDto extends PageDto implements Serializable {
 
     private String mpmId;
-private String machineId;
-private String planId;
-private String communityId;
-private String machineName;
+    private String machineId;
+    private String planId;
+    private String[] planIds;
+    private String communityId;
+    private String machineName;
+
+    private long machineCount;
 
 
     private Date createTime;
@@ -29,31 +33,40 @@ private String machineName;
     public String getMpmId() {
         return mpmId;
     }
-public void setMpmId(String mpmId) {
+
+    public void setMpmId(String mpmId) {
         this.mpmId = mpmId;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getPlanId() {
+
+    public String getPlanId() {
         return planId;
     }
-public void setPlanId(String planId) {
+
+    public void setPlanId(String planId) {
         this.planId = planId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getMachineName() {
+
+    public String getMachineName() {
         return machineName;
     }
-public void setMachineName(String machineName) {
+
+    public void setMachineName(String machineName) {
         this.machineName = machineName;
     }
 
@@ -73,4 +86,20 @@ public void setMachineName(String machineName) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getPlanIds() {
+        return planIds;
+    }
+
+    public void setPlanIds(String[] planIds) {
+        this.planIds = planIds;
+    }
+
+    public long getMachineCount() {
+        return machineCount;
+    }
+
+    public void setMachineCount(long machineCount) {
+        this.machineCount = machineCount;
+    }
 }

java110-bean/src/main/java/com/java110/dto/maintainancePlanStaff/MaintainancePlanStaffDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainancePlanStaff;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,10 +16,12 @@ import java.util.Date;
 public class MaintainancePlanStaffDto extends PageDto implements Serializable {
 
     private String staffName;
-private String planId;
-private String communityId;
-private String staffId;
-private String mpsId;
+    private String planId;
+    private String[] planIds;
+    private String communityId;
+    private String staffId;
+    private String mpsId;
+    private long staffCount;
 
 
     private Date createTime;
@@ -29,31 +32,40 @@ private String mpsId;
     public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getPlanId() {
+
+    public String getPlanId() {
         return planId;
     }
-public void setPlanId(String planId) {
+
+    public void setPlanId(String planId) {
         this.planId = planId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
-public String getMpsId() {
+
+    public String getMpsId() {
         return mpsId;
     }
-public void setMpsId(String mpsId) {
+
+    public void setMpsId(String mpsId) {
         this.mpsId = mpsId;
     }
 
@@ -73,4 +85,20 @@ public void setMpsId(String mpsId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getPlanIds() {
+        return planIds;
+    }
+
+    public void setPlanIds(String[] planIds) {
+        this.planIds = planIds;
+    }
+
+    public long getStaffCount() {
+        return staffCount;
+    }
+
+    public void setStaffCount(long staffCount) {
+        this.staffCount = staffCount;
+    }
 }

java110-db/src/main/resources/mapper/community/MaintainancePlanMachineV1ServiceDaoImplMapper.xml

@@ -109,4 +109,26 @@
 
     </select>
 
+
+    <!-- 查询保养设备信息 add by wuxw 2018-07-03 -->
+    <select id="queryMaintainancePlanMachinesGroupCount" parameterType="Map" resultType="Map">
+        select t.plan_id planId,count(1) machineCount
+        from maintainance_plan_machine t
+        where 1 =1
+        and t.status_cd = 0
+
+        <if test="planIds !=null ">
+            and t.plan_id in
+            <foreach collection="planIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        group  by t.plan_id
+
+    </select>
+
 </mapper>

java110-db/src/main/resources/mapper/community/MaintainancePlanStaffV1ServiceDaoImplMapper.xml

@@ -94,4 +94,22 @@
 
     </select>
 
+
+
+    <select id="queryMaintainancePlanStaffsGroupCount" parameterType="Map" resultType="Map">
+        select t.plan_id planId,count(1) staffCount
+        from maintainance_plan_staff t
+        where 1 =1
+        <if test="planIds !=null ">
+            and t.plan_id in
+            <foreach collection="planIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
+
+    </select>
 </mapper>

java110-interface/src/main/java/com/java110/intf/community/IMaintainancePlanMachineV1InnerServiceSMO.java

@@ -65,4 +65,7 @@ public interface IMaintainancePlanMachineV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryMaintainancePlanMachinesCount", method = RequestMethod.POST)
     int queryMaintainancePlanMachinesCount(@RequestBody MaintainancePlanMachineDto maintainancePlanMachineDto);
+
+    @RequestMapping(value = "/queryMaintainancePlanMachinesGroupCount", method = RequestMethod.POST)
+    List<MaintainancePlanMachineDto> queryMaintainancePlanMachinesGroupCount(@RequestBody MaintainancePlanMachineDto maintainancePlanMachineDto);
 }

java110-interface/src/main/java/com/java110/intf/community/IMaintainancePlanStaffV1InnerServiceSMO.java

@@ -16,6 +16,7 @@
 package com.java110.intf.community;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.maintainancePlanMachine.MaintainancePlanMachineDto;
 import com.java110.dto.maintainancePlanStaff.MaintainancePlanStaffDto;
 import com.java110.po.maintainancePlanStaff.MaintainancePlanStaffPo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -65,4 +66,7 @@ public interface IMaintainancePlanStaffV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryMaintainancePlanStaffsCount", method = RequestMethod.POST)
     int queryMaintainancePlanStaffsCount(@RequestBody MaintainancePlanStaffDto maintainancePlanStaffDto);
+
+    @RequestMapping(value = "/queryMaintainancePlanStaffsGroupCount", method = RequestMethod.POST)
+    List<MaintainancePlanStaffDto> queryMaintainancePlanStaffsGroupCount(@RequestBody MaintainancePlanStaffDto maintainancePlanStaffDto);
 }

service-community/src/main/java/com/java110/community/cmd/maintainancePlan/ListMaintainancePlanCmd.java

@@ -22,6 +22,10 @@ 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.maintainancePlanMachine.MaintainancePlanMachineDto;
+import com.java110.dto.maintainancePlanStaff.MaintainancePlanStaffDto;
+import com.java110.intf.community.IMaintainancePlanMachineV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainancePlanStaffV1InnerServiceSMO;
 import com.java110.intf.community.IMaintainancePlanV1InnerServiceSMO;
 import com.java110.po.maintainancePlan.MaintainancePlanPo;
 import com.java110.utils.exception.CmdException;
@@ -57,6 +61,14 @@ public class ListMaintainancePlanCmd extends Cmd {
     @Autowired
     private IMaintainancePlanV1InnerServiceSMO maintainancePlanV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMaintainancePlanStaffV1InnerServiceSMO maintainancePlanStaffV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IMaintainancePlanMachineV1InnerServiceSMO maintainancePlanMachineV1InnerServiceSMOImpl;
+
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -73,6 +85,7 @@ public class ListMaintainancePlanCmd extends Cmd {
 
         if (count > 0) {
             maintainancePlanDtos = maintainancePlanV1InnerServiceSMOImpl.queryMaintainancePlans(maintainancePlanDto);
+            freshStaffAndMachineCount(maintainancePlanDtos);
         } else {
             maintainancePlanDtos = new ArrayList<>();
         }
@@ -83,4 +96,48 @@ public class ListMaintainancePlanCmd extends Cmd {
 
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+    private void freshStaffAndMachineCount(List<MaintainancePlanDto> maintainancePlanDtos) {
+
+        if(maintainancePlanDtos == null || maintainancePlanDtos.size()<1){
+            return;
+        }
+
+        List<String> planIds = new ArrayList<>();
+
+        for(MaintainancePlanDto maintainancePlanDto : maintainancePlanDtos){
+            planIds.add(maintainancePlanDto.getPlanId());
+        }
+
+
+        MaintainancePlanMachineDto maintainancePlanMachineDto = new MaintainancePlanMachineDto();
+        maintainancePlanMachineDto.setPlanIds(planIds.toArray(new String[planIds.size()]));
+        maintainancePlanMachineDto.setCommunityId(maintainancePlanDtos.get(0).getCommunityId());
+        List<MaintainancePlanMachineDto> maintainancePlanMachineDtos = maintainancePlanMachineV1InnerServiceSMOImpl.queryMaintainancePlanMachinesGroupCount(maintainancePlanMachineDto);
+
+        if(maintainancePlanMachineDtos != null && maintainancePlanMachineDtos.size()> 0) {
+            for (MaintainancePlanDto maintainancePlanDto : maintainancePlanDtos) {
+                for (MaintainancePlanMachineDto tmpMaintainancePlanMachineDto : maintainancePlanMachineDtos) {
+                    if (maintainancePlanDto.getPlanId().equals(tmpMaintainancePlanMachineDto.getPlanId())) {
+                        maintainancePlanDto.setMachineCount(tmpMaintainancePlanMachineDto.getMachineCount());
+                    }
+                }
+            }
+        }
+
+        MaintainancePlanStaffDto maintainancePlanStaffDto = new MaintainancePlanStaffDto();
+        maintainancePlanStaffDto.setPlanIds(planIds.toArray(new String[planIds.size()]));
+        maintainancePlanStaffDto.setCommunityId(maintainancePlanDtos.get(0).getCommunityId());
+        List<MaintainancePlanStaffDto> maintainancePlanStaffDtos = maintainancePlanStaffV1InnerServiceSMOImpl.queryMaintainancePlanStaffsGroupCount(maintainancePlanStaffDto);
+
+        if(maintainancePlanStaffDtos != null && maintainancePlanStaffDtos.size()> 0) {
+            for (MaintainancePlanDto maintainancePlanDto : maintainancePlanDtos) {
+                for (MaintainancePlanStaffDto tmpMaintainancePlanStaffDto : maintainancePlanStaffDtos) {
+                    if (maintainancePlanDto.getPlanId().equals(tmpMaintainancePlanStaffDto.getPlanId())) {
+                        maintainancePlanDto.setStaffCount(tmpMaintainancePlanStaffDto.getStaffCount());
+                    }
+                }
+            }
+        }
+    }
 }

service-community/src/main/java/com/java110/community/dao/IMaintainancePlanMachineV1ServiceDao.java

@@ -74,4 +74,5 @@ public interface IMaintainancePlanMachineV1ServiceDao {
      */
     int queryMaintainancePlanMachinesCount(Map info);
 
+    List<Map> queryMaintainancePlanMachinesGroupCount(Map map);
 }

service-community/src/main/java/com/java110/community/dao/IMaintainancePlanStaffV1ServiceDao.java

@@ -74,4 +74,5 @@ public interface IMaintainancePlanStaffV1ServiceDao {
      */
     int queryMaintainancePlanStaffsCount(Map info);
 
+    List<Map> queryMaintainancePlanStaffsGroupCount(Map map);
 }

service-community/src/main/java/com/java110/community/dao/impl/MaintainancePlanMachineV1ServiceDaoImpl.java

@@ -108,5 +108,21 @@ public class MaintainancePlanMachineV1ServiceDaoImpl extends BaseServiceDao impl
         return Integer.parseInt(businessMaintainancePlanMachineInfos.get(0).get("count").toString());
     }
 
+    /**
+     * 查询保养设备信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> queryMaintainancePlanMachinesGroupCount(Map info) throws DAOException {
+        logger.debug("查询 queryMaintainancePlanMachinesGroupCount 入参 info : {}",info);
+
+        List<Map> businessMaintainancePlanMachineInfos = sqlSessionTemplate.selectList("maintainancePlanMachineV1ServiceDaoImpl.queryMaintainancePlanMachinesGroupCount",info);
+
+        return businessMaintainancePlanMachineInfos;
+    }
+
+
 
 }

service-community/src/main/java/com/java110/community/dao/impl/MaintainancePlanStaffV1ServiceDaoImpl.java

@@ -108,5 +108,19 @@ public class MaintainancePlanStaffV1ServiceDaoImpl extends BaseServiceDao implem
         return Integer.parseInt(businessMaintainancePlanStaffInfos.get(0).get("count").toString());
     }
 
+    /**
+     * 查询保养计划员工信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> queryMaintainancePlanStaffsGroupCount(Map info) throws DAOException {
+        logger.debug("查询 queryMaintainancePlanStaffsGroupCount 入参 info : {}",info);
+
+        List<Map> businessMaintainancePlanStaffInfos = sqlSessionTemplate.selectList("maintainancePlanStaffV1ServiceDaoImpl.queryMaintainancePlanStaffsGroupCount",info);
+
+        return businessMaintainancePlanStaffInfos;
+    }
 
 }

service-community/src/main/java/com/java110/community/smo/impl/MaintainancePlanMachineV1InnerServiceSMOImpl.java

@@ -86,4 +86,14 @@ public class MaintainancePlanMachineV1InnerServiceSMOImpl extends BaseServiceSMO
     public int queryMaintainancePlanMachinesCount(@RequestBody MaintainancePlanMachineDto maintainancePlanMachineDto) {
         return maintainancePlanMachineV1ServiceDaoImpl.queryMaintainancePlanMachinesCount(BeanConvertUtil.beanCovertMap(maintainancePlanMachineDto));    }
 
+
+    @Override
+    public List<MaintainancePlanMachineDto> queryMaintainancePlanMachinesGroupCount(@RequestBody  MaintainancePlanMachineDto maintainancePlanMachineDto) {
+
+        //校验是否传了 分页信息
+
+        List<MaintainancePlanMachineDto> maintainancePlanMachines = BeanConvertUtil.covertBeanList(maintainancePlanMachineV1ServiceDaoImpl.queryMaintainancePlanMachinesGroupCount(BeanConvertUtil.beanCovertMap(maintainancePlanMachineDto)), MaintainancePlanMachineDto.class);
+
+        return maintainancePlanMachines;
+    }
 }

service-community/src/main/java/com/java110/community/smo/impl/MaintainancePlanStaffV1InnerServiceSMOImpl.java

@@ -86,4 +86,14 @@ public class MaintainancePlanStaffV1InnerServiceSMOImpl extends BaseServiceSMO i
     public int queryMaintainancePlanStaffsCount(@RequestBody MaintainancePlanStaffDto maintainancePlanStaffDto) {
         return maintainancePlanStaffV1ServiceDaoImpl.queryMaintainancePlanStaffsCount(BeanConvertUtil.beanCovertMap(maintainancePlanStaffDto));    }
 
+    @Override
+    public List<MaintainancePlanStaffDto> queryMaintainancePlanStaffsGroupCount(@RequestBody  MaintainancePlanStaffDto maintainancePlanStaffDto) {
+
+        //校验是否传了 分页信息
+
+
+        List<MaintainancePlanStaffDto> maintainancePlanStaffs = BeanConvertUtil.covertBeanList(maintainancePlanStaffV1ServiceDaoImpl.queryMaintainancePlanStaffsGroupCount(BeanConvertUtil.beanCovertMap(maintainancePlanStaffDto)), MaintainancePlanStaffDto.class);
+
+        return maintainancePlanStaffs;
+    }
 }