Przeglądaj źródła

加入保养标准

wuxw 3 lat temu
rodzic
commit
dfb3dc172e

+ 28 - 10
java110-bean/src/main/java/com/java110/dto/maintainanceStandard/MaintainanceStandardDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainanceStandard;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,38 +16,47 @@ import java.util.Date;
 public class MaintainanceStandardDto extends PageDto implements Serializable {
 
     private String standardName;
-private String standardId;
-private String remark;
-private String communityId;
+    private String standardId;
+    private String remark;
+    private String communityId;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private long itemCount;
+
 
     public String getStandardName() {
         return standardName;
     }
-public void setStandardName(String standardName) {
+
+    public void setStandardName(String standardName) {
         this.standardName = standardName;
     }
-public String getStandardId() {
+
+    public String getStandardId() {
         return standardId;
     }
-public void setStandardId(String standardId) {
+
+    public void setStandardId(String standardId) {
         this.standardId = standardId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -66,4 +76,12 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public long getItemCount() {
+        return itemCount;
+    }
+
+    public void setItemCount(long itemCount) {
+        this.itemCount = itemCount;
+    }
 }

+ 19 - 0
java110-bean/src/main/java/com/java110/dto/maintainanceStandardItem/MaintainanceStandardItemDto.java

@@ -18,9 +18,12 @@ public class MaintainanceStandardItemDto extends MaintainanceItemDto implements
 
     private String itemId;
     private String standardId;
+    private String[] standardIds;
     private String msiId;
     private String communityId;
 
+    private long itemCount;
+
 
     private Date createTime;
 
@@ -75,4 +78,20 @@ public class MaintainanceStandardItemDto extends MaintainanceItemDto implements
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getStandardIds() {
+        return standardIds;
+    }
+
+    public void setStandardIds(String[] standardIds) {
+        this.standardIds = standardIds;
+    }
+
+    public long getItemCount() {
+        return itemCount;
+    }
+
+    public void setItemCount(long itemCount) {
+        this.itemCount = itemCount;
+    }
 }

+ 33 - 0
java110-db/src/main/resources/mapper/community/MaintainanceStandardItemV1ServiceDaoImplMapper.xml

@@ -91,4 +91,37 @@
 
     </select>
 
+
+    <!-- 查询保养标准信息 add by wuxw 2018-07-03 -->
+    <select id="queryMaintainanceStandardItemsGroupCount" parameterType="Map" resultType="Map">
+        select t.standard_id standardId,count(1) itemCount
+        from maintainance_standard_item t
+        where 1 =1
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="standardId !=null and standardId != ''">
+            and t.standard_id= #{standardId}
+        </if>
+        <if test="standardIds !=null ">
+            and t.standard_id in
+            <foreach collection="standardIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="msiId !=null and msiId != ''">
+            and t.msi_id= #{msiId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
+        group by t.standard_id
+
+
+    </select>
+
 </mapper>

+ 3 - 0
java110-interface/src/main/java/com/java110/intf/community/IMaintainanceStandardItemV1InnerServiceSMO.java

@@ -65,4 +65,7 @@ public interface IMaintainanceStandardItemV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryMaintainanceStandardItemsCount", method = RequestMethod.POST)
     int queryMaintainanceStandardItemsCount(@RequestBody MaintainanceStandardItemDto maintainanceStandardItemDto);
+
+    @RequestMapping(value = "/queryMaintainanceStandardItemsGroupCount", method = RequestMethod.POST)
+    List<MaintainanceStandardItemDto> queryMaintainanceStandardItemsGroupCount(@RequestBody MaintainanceStandardItemDto maintainanceStandardItemDto);
 }

+ 34 - 0
service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceStandardCmd.java

@@ -20,6 +20,8 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.maintainanceStandardItem.MaintainanceStandardItemDto;
+import com.java110.intf.community.IMaintainanceStandardItemV1InnerServiceSMO;
 import com.java110.intf.community.IMaintainanceStandardV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -52,6 +54,10 @@ public class ListMaintainanceStandardCmd extends Cmd {
     @Autowired
     private IMaintainanceStandardV1InnerServiceSMO maintainanceStandardV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IMaintainanceStandardItemV1InnerServiceSMO maintainanceStandardItemV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
@@ -69,6 +75,9 @@ public class ListMaintainanceStandardCmd extends Cmd {
 
            if (count > 0) {
                maintainanceStandardDtos = maintainanceStandardV1InnerServiceSMOImpl.queryMaintainanceStandards(maintainanceStandardDto);
+
+               refreshItemCount(maintainanceStandardDtos);
+
            } else {
                maintainanceStandardDtos = new ArrayList<>();
            }
@@ -79,4 +88,29 @@ public class ListMaintainanceStandardCmd extends Cmd {
 
            cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+    private void refreshItemCount(List<MaintainanceStandardDto> maintainanceStandardDtos) {
+
+        if(maintainanceStandardDtos == null || maintainanceStandardDtos.size()< 1){
+            return ;
+        }
+
+        List<String> standardIds = new ArrayList<>();
+        for(MaintainanceStandardDto maintainanceStandardDto : maintainanceStandardDtos){
+            standardIds.add(maintainanceStandardDto.getStandardId());
+        }
+
+        MaintainanceStandardItemDto maintainanceStandardItemDto = new MaintainanceStandardItemDto();
+        maintainanceStandardItemDto.setStandardIds(standardIds.toArray(new String[standardIds.size()]));
+        maintainanceStandardItemDto.setCommunityId(maintainanceStandardDtos.get(0).getCommunityId());
+
+        List<MaintainanceStandardItemDto> maintainanceStandardItemDtos = maintainanceStandardItemV1InnerServiceSMOImpl.queryMaintainanceStandardItemsGroupCount(maintainanceStandardItemDto);
+
+        for(MaintainanceStandardDto maintainanceStandardDto : maintainanceStandardDtos){
+            for(MaintainanceStandardItemDto tmpMaintainanceStandardItemDto : maintainanceStandardItemDtos){
+                if(maintainanceStandardDto.getStandardId().equals(tmpMaintainanceStandardItemDto.getStandardId()))
+                    maintainanceStandardDto.setItemCount(tmpMaintainanceStandardItemDto.getItemCount());
+            }
+        }
+    }
 }

+ 6 - 0
service-community/src/main/java/com/java110/community/dao/IMaintainanceStandardItemV1ServiceDao.java

@@ -74,4 +74,10 @@ public interface IMaintainanceStandardItemV1ServiceDao {
      */
     int queryMaintainanceStandardItemsCount(Map info);
 
+    /**
+     * 根据标准 分组查询数据
+     * @param info
+     * @return
+     */
+    List<Map> queryMaintainanceStandardItemsGroupCount(Map info);
 }

+ 9 - 0
service-community/src/main/java/com/java110/community/dao/impl/MaintainanceStandardItemV1ServiceDaoImpl.java

@@ -108,5 +108,14 @@ public class MaintainanceStandardItemV1ServiceDaoImpl extends BaseServiceDao imp
         return Integer.parseInt(businessMaintainanceStandardItemInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public List<Map> queryMaintainanceStandardItemsGroupCount(Map info) {
+        logger.debug("查询 queryMaintainanceStandardItemsGroupCount 入参 info : {}",info);
+
+        List<Map> businessMaintainanceStandardItemInfos = sqlSessionTemplate.selectList("maintainanceStandardItemV1ServiceDaoImpl.queryMaintainanceStandardItemsGroupCount",info);
+
+        return businessMaintainanceStandardItemInfos;
+    }
+
 
 }

+ 7 - 0
service-community/src/main/java/com/java110/community/smo/impl/MaintainanceStandardItemV1InnerServiceSMOImpl.java

@@ -86,4 +86,11 @@ public class MaintainanceStandardItemV1InnerServiceSMOImpl extends BaseServiceSM
     public int queryMaintainanceStandardItemsCount(@RequestBody MaintainanceStandardItemDto maintainanceStandardItemDto) {
         return maintainanceStandardItemV1ServiceDaoImpl.queryMaintainanceStandardItemsCount(BeanConvertUtil.beanCovertMap(maintainanceStandardItemDto));    }
 
+    @Override
+    public List<MaintainanceStandardItemDto> queryMaintainanceStandardItemsGroupCount(@RequestBody MaintainanceStandardItemDto maintainanceStandardItemDto) {
+        List<MaintainanceStandardItemDto> maintainanceStandardItems = BeanConvertUtil.covertBeanList(maintainanceStandardItemV1ServiceDaoImpl.queryMaintainanceStandardItemsGroupCount(BeanConvertUtil.beanCovertMap(maintainanceStandardItemDto)), MaintainanceStandardItemDto.class);
+
+        return maintainanceStandardItems;
+    }
+
 }