优化代码

java110-bean/src/main/java/com/java110/dto/maintainanceItem/MaintainanceItemDto.java

@@ -1,9 +1,11 @@
 package com.java110.dto.maintainanceItem;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.maintainanceItemValue.MaintainanceItemValueDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -30,6 +32,8 @@ public class MaintainanceItemDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    List<MaintainanceItemValueDto> values;
+
 
     public String getItemId() {
         return itemId;
@@ -87,4 +91,12 @@ public class MaintainanceItemDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<MaintainanceItemValueDto> getValues() {
+        return values;
+    }
+
+    public void setValues(List<MaintainanceItemValueDto> values) {
+        this.values = values;
+    }
 }

java110-bean/src/main/java/com/java110/dto/maintainanceItemValue/MaintainanceItemValueDto.java

@@ -1,8 +1,10 @@
 package com.java110.dto.maintainanceItemValue;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -15,10 +17,11 @@ import java.util.Date;
 public class MaintainanceItemValueDto extends PageDto implements Serializable {
 
     private String itemId;
-private String valueId;
-private String itemValue;
-private String communityId;
-private String seq;
+    private String[] itemIds;
+    private String valueId;
+    private String itemValue;
+    private String communityId;
+    private String seq;
 
 
     private Date createTime;
@@ -26,34 +29,45 @@ private String seq;
     private String statusCd = "0";
 
 
+
+
     public String getItemId() {
         return itemId;
     }
-public void setItemId(String itemId) {
+
+    public void setItemId(String itemId) {
         this.itemId = itemId;
     }
-public String getValueId() {
+
+    public String getValueId() {
         return valueId;
     }
-public void setValueId(String valueId) {
+
+    public void setValueId(String valueId) {
         this.valueId = valueId;
     }
-public String getItemValue() {
+
+    public String getItemValue() {
         return itemValue;
     }
-public void setItemValue(String itemValue) {
+
+    public void setItemValue(String itemValue) {
         this.itemValue = itemValue;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getSeq() {
+
+    public String getSeq() {
         return seq;
     }
-public void setSeq(String seq) {
+
+    public void setSeq(String seq) {
         this.seq = seq;
     }
 
@@ -73,4 +87,14 @@ public void setSeq(String seq) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getItemIds() {
+        return itemIds;
+    }
+
+    public void setItemIds(String[] itemIds) {
+        this.itemIds = itemIds;
+    }
+
+
 }

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

@@ -5,102 +5,98 @@
 <mapper namespace="maintainanceItemV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存保养检查项信息 add by wuxw 2018-07-03 -->
     <insert id="saveMaintainanceItemInfo" parameterType="Map">
         insert into maintainance_item(
-item_id,title_type,item_title,community_id,seq
-) values (
-#{itemId},#{titleType},#{itemTitle},#{communityId},#{seq}
-)
+        item_id,title_type,item_title,community_id,seq
+        ) values (
+        #{itemId},#{titleType},#{itemTitle},#{communityId},#{seq}
+        )
     </insert>
 
 
-
     <!-- 查询保养检查项信息 add by wuxw 2018-07-03 -->
     <select id="getMaintainanceItemInfo" parameterType="Map" resultType="Map">
-        select  t.item_id,t.item_id itemId,t.title_type,t.title_type titleType,t.item_title,t.item_title itemTitle,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.seq 
-from maintainance_item t 
-where 1 =1 
-<if test="itemId !=null and itemId != ''">
-   and t.item_id= #{itemId}
-</if> 
-<if test="titleType !=null and titleType != ''">
-   and t.title_type= #{titleType}
-</if> 
-<if test="itemTitle !=null and itemTitle != ''">
-   and t.item_title= #{itemTitle}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="seq !=null and seq != ''">
-   and t.seq= #{seq}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.item_id,t.item_id itemId,t.title_type,t.title_type titleType,t.item_title,t.item_title
+        itemTitle,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.seq,t.create_time createTime
+        from maintainance_item t
+        where 1 =1
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="titleType !=null and titleType != ''">
+            and t.title_type= #{titleType}
+        </if>
+        <if test="itemTitle !=null and itemTitle != ''">
+            and t.item_title= #{itemTitle}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="seq !=null and seq != ''">
+            and t.seq= #{seq}
+        </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="updateMaintainanceItemInfo" parameterType="Map">
-        update  maintainance_item t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="titleType !=null and titleType != ''">
-, t.title_type= #{titleType}
-</if> 
-<if test="itemTitle !=null and itemTitle != ''">
-, t.item_title= #{itemTitle}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="seq !=null and seq != ''">
-, t.seq= #{seq}
-</if> 
- where 1=1 <if test="itemId !=null and itemId != ''">
-and t.item_id= #{itemId}
-</if> 
+        update maintainance_item t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="titleType !=null and titleType != ''">
+            , t.title_type= #{titleType}
+        </if>
+        <if test="itemTitle !=null and itemTitle != ''">
+            , t.item_title= #{itemTitle}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="seq !=null and seq != ''">
+            , t.seq= #{seq}
+        </if>
+        where 1=1
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
 
     </update>
 
     <!-- 查询保养检查项数量 add by wuxw 2018-07-03 -->
-     <select id="queryMaintainanceItemsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from maintainance_item t 
-where 1 =1 
-<if test="itemId !=null and itemId != ''">
-   and t.item_id= #{itemId}
-</if> 
-<if test="titleType !=null and titleType != ''">
-   and t.title_type= #{titleType}
-</if> 
-<if test="itemTitle !=null and itemTitle != ''">
-   and t.item_title= #{itemTitle}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="seq !=null and seq != ''">
-   and t.seq= #{seq}
-</if> 
+    <select id="queryMaintainanceItemsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from maintainance_item t
+        where 1 =1
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="titleType !=null and titleType != ''">
+            and t.title_type= #{titleType}
+        </if>
+        <if test="itemTitle !=null and itemTitle != ''">
+            and t.item_title= #{itemTitle}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="seq !=null and seq != ''">
+            and t.seq= #{seq}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

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

@@ -24,6 +24,12 @@
         <if test="itemId !=null and itemId != ''">
             and t.item_id= #{itemId}
         </if>
+        <if test="itemIds !=null">
+            and t.item_id in
+            <foreach collection="itemIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
         </if>
@@ -80,6 +86,12 @@
         <if test="itemId !=null and itemId != ''">
             and t.item_id= #{itemId}
         </if>
+        <if test="itemIds !=null">
+            and t.item_id in
+            <foreach collection="itemIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}
         </if>

service-community/src/main/java/com/java110/community/cmd/maintainance/ListMaintainanceItemCmd.java

@@ -20,7 +20,11 @@ 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.inspectionItemTitle.InspectionItemTitleDto;
+import com.java110.dto.inspectionItemTitleValue.InspectionItemTitleValueDto;
+import com.java110.dto.maintainanceItemValue.MaintainanceItemValueDto;
 import com.java110.intf.community.IMaintainanceItemV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainanceItemValueV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -54,10 +58,14 @@ public class ListMaintainanceItemCmd extends Cmd {
     @Autowired
     private IMaintainanceItemV1InnerServiceSMO maintainanceItemV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMaintainanceItemValueV1InnerServiceSMO maintainanceItemValueV1InnerServiceSMOImpl;
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
-        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
     }
 
     @Override
@@ -71,6 +79,7 @@ public class ListMaintainanceItemCmd extends Cmd {
 
         if (count > 0) {
             maintainanceItemDtos = maintainanceItemV1InnerServiceSMOImpl.queryMaintainanceItems(maintainanceItemDto);
+            refreshTitileValues(maintainanceItemDtos);
         } else {
             maintainanceItemDtos = new ArrayList<>();
         }
@@ -81,4 +90,35 @@ public class ListMaintainanceItemCmd extends Cmd {
 
         cmdDataFlowContext.setResponseEntity(responseEntity);
     }
+
+    private void refreshTitileValues(List<MaintainanceItemDto> maintainanceItemDtos) {
+
+        if (maintainanceItemDtos == null || maintainanceItemDtos.size() < 1) {
+            return;
+        }
+
+        List<String> itemIds = new ArrayList<>();
+        for (MaintainanceItemDto maintainanceItemDto : maintainanceItemDtos) {
+            itemIds.add(maintainanceItemDto.getItemId());
+        }
+
+        MaintainanceItemValueDto maintainanceItemValueDto = new MaintainanceItemValueDto();
+        maintainanceItemValueDto.setItemIds(itemIds.toArray(new String[itemIds.size()]));
+        maintainanceItemValueDto.setCommunityId(maintainanceItemDtos.get(0).getCommunityId());
+        List<MaintainanceItemValueDto> maintainanceItemValueDtos
+                = maintainanceItemValueV1InnerServiceSMOImpl.queryMaintainanceItemValues(maintainanceItemValueDto);
+
+        List<MaintainanceItemValueDto> tmpMaintainanceItemValueDtos = null;
+        for (MaintainanceItemDto maintainanceItemDto : maintainanceItemDtos) {
+            tmpMaintainanceItemValueDtos = new ArrayList<>();
+            for (MaintainanceItemValueDto tmpMaintainanceItemValueDto : maintainanceItemValueDtos) {
+                if (maintainanceItemDto.getItemId().equals(tmpMaintainanceItemValueDto.getItemId())) {
+                    tmpMaintainanceItemValueDtos.add(tmpMaintainanceItemValueDto);
+                }
+            }
+            maintainanceItemDto.setValues(tmpMaintainanceItemValueDtos);
+        }
+
+
+    }
 }