加入 巡检项目和 nfc 编码

java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionDto.java

@@ -42,6 +42,10 @@ public class InspectionDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String itemId;
+    private String itemName;
+    private String nfcCode;
+
 
     public String getInspectionId() {
         return inspectionId;
@@ -208,13 +212,40 @@ public class InspectionDto extends PageDto implements Serializable {
     public String getPointStartTime() {
         return pointStartTime;
     }
+
     public void setPointStartTime(String pointStartTime) {
         this.pointStartTime = pointStartTime;
     }
+
     public String getPointEndTime() {
         return pointEndTime;
     }
+
     public void setPointEndTime(String pointEndTime) {
         this.pointEndTime = pointEndTime;
     }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getNfcCode() {
+        return nfcCode;
+    }
+
+    public void setNfcCode(String nfcCode) {
+        this.nfcCode = nfcCode;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
 }

java110-bean/src/main/java/com/java110/po/inspection/InspectionPointPo.java

@@ -19,6 +19,8 @@ public class InspectionPointPo implements Serializable {
     private String pointObjId;
     private String pointObjName;
     private String remark;
+    private String itemId;
+    private String nfcCode;
 
     public String getInspectionId() {
         return inspectionId;
@@ -78,4 +80,19 @@ public class InspectionPointPo implements Serializable {
         this.pointObjName = pointObjName;
     }
 
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getNfcCode() {
+        return nfcCode;
+    }
+
+    public void setNfcCode(String nfcCode) {
+        this.nfcCode = nfcCode;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionPoint/ApiInspectionPointDataVo.java

@@ -24,6 +24,9 @@ public class ApiInspectionPointDataVo implements Serializable {
     private String pointStartTime;
     private String pointEndTime;
     private String sortNumber;
+    private String itemId;
+    private String itemName;
+    private String nfcCode;
 
     public String getInspectionId() {
         return inspectionId;
@@ -184,4 +187,28 @@ public class ApiInspectionPointDataVo implements Serializable {
     public void setIrpRelId(String irpRelId) {
         this.irpRelId = irpRelId;
     }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getNfcCode() {
+        return nfcCode;
+    }
+
+    public void setNfcCode(String nfcCode) {
+        this.nfcCode = nfcCode;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
 }

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

@@ -27,6 +27,12 @@
         <if test="titleId !=null and titleId != ''">
             and t.title_id= #{titleId}
         </if>
+        <if test="titleIds !=null">
+            and t.title_id in
+            <foreach collection="titleIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="itemValue !=null and itemValue != ''">
             and t.item_value= #{itemValue}
         </if>
@@ -39,7 +45,7 @@
         <if test="seq !=null and seq != ''">
             and t.seq= #{seq}
         </if>
-        order by t.create_time desc
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

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

@@ -7,9 +7,9 @@
     <!-- 保存巡检点信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessInspectionInfo" parameterType="Map">
         insert into business_inspection_point
-        (inspection_id,operate,remark,inspection_name,community_id,b_id,point_obj_type,point_obj_id,point_obj_name)
+        (inspection_id,operate,remark,inspection_name,community_id,b_id,point_obj_type,point_obj_id,point_obj_name,item_id,nfc_code)
         values
-        (#{inspectionId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId},#{pointObjType},#{pointObjId},#{pointObjName})
+        (#{inspectionId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId},#{pointObjType},#{pointObjId},#{pointObjName},#{itemId},#{nfcCode})
     </insert>
 
     <!-- 查询巡检点信息（Business） add by wuxw 2018-07-03 -->
@@ -17,7 +17,7 @@
         select t.inspection_id,t.inspection_id inspectionId,t.operate,t.remark,t.inspection_name,t.inspection_name
         inspectionName,
         t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.point_obj_type,t.point_obj_id,t.point_obj_name,
-        t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName
+        t.point_obj_type pointObjType,t.point_obj_id pointObjId,t.point_obj_name pointObjName,t.item_id ,t.item_id itemId,t.nfc_code,t.nfc_code nfcCode
         from business_inspection_point t
         where 1 =1
         <if test="inspectionId !=null and inspectionId != ''">
@@ -45,9 +45,9 @@
         insert into
         inspection_point(
         inspection_id,remark,status_cd,inspection_name,community_id,b_id,
-        point_obj_type,point_obj_id,point_obj_name
+        point_obj_type,point_obj_id,point_obj_name,item_id,nfc_code
         ) select t.inspection_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id,
-        t.point_obj_type,t.point_obj_id,t.point_obj_name
+        t.point_obj_type,t.point_obj_id,t.point_obj_name,t.item_id,t.nfc_code
         from business_inspection_point t where 1=1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
@@ -74,8 +74,9 @@
         t.inspection_name,t.inspection_name inspectionName,t.community_id,
         t.community_id communityId,t.b_id,t.b_id bId,
         t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
-        t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName
+        t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName,t.item_id ,t.item_id itemId,t.nfc_code,t.nfc_code nfcCode,ii.item_name itemName
         from inspection_point t
+        LEFT JOIN inspection_item ii on t.item_id = ii.item_id and ii.status_cd = '0'
         <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
             left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
             and c.status_cd = '0'
@@ -93,6 +94,12 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="nfcCode !=null and nfcCode != ''">
+            and t.nfc_code= #{nfcCode}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -136,6 +143,12 @@
         <if test="communityId !=null and communityId != ''">
             , t.community_id= #{communityId}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            , t.item_id= #{itemId}
+        </if>
+        <if test="nfcCode !=null and nfcCode != ''">
+            , t.nfc_code= #{nfcCode}
+        </if>
         where 1=1
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
@@ -164,6 +177,12 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="nfcCode !=null and nfcCode != ''">
+            and t.nfc_code= #{nfcCode}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -185,8 +204,10 @@
         t.inspection_name,t.inspection_name inspectionName,t.community_id,
         t.community_id communityId,t.b_id,t.b_id bId,
         t.point_obj_type,t.point_obj_type pointObjType,td.name pointTypeName,t.point_obj_id,
-        t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName
+        t.point_obj_id pointObjId,t.point_obj_name,t.point_obj_name pointObjName,
+        t.item_id ,t.item_id itemId,t.nfc_code,t.nfc_code nfcCode,ii.item_name itemName
         from inspection_point t
+        LEFT JOIN inspection_item ii on t.item_id = ii.item_id and ii.status_cd = '0'
         left join inspection_route_point_rel c on t.inspection_id = c.inspection_id and c.status_cd = '0' and
         c.inspection_route_id = #{inspectionRouteId}
         left join t_dict td on t.point_obj_type = td.status_cd and td.table_name = 'inspection_point' and
@@ -207,6 +228,12 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="nfcCode !=null and nfcCode != ''">
+            and t.nfc_code= #{nfcCode}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -247,6 +274,12 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="nfcCode !=null and nfcCode != ''">
+            and t.nfc_code= #{nfcCode}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
@@ -291,6 +324,12 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
+        <if test="itemId !=null and itemId != ''">
+            and t.item_id= #{itemId}
+        </if>
+        <if test="nfcCode !=null and nfcCode != ''">
+            and t.nfc_code= #{nfcCode}
+        </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>

service-community/src/main/java/com/java110/community/listener/inspectionPoint/AbstractInspectionBusinessServiceDataFlowListener.java

@@ -45,6 +45,8 @@ public abstract class AbstractInspectionBusinessServiceDataFlowListener extends
         businessInspectionInfo.put("pointObjType", businessInspectionInfo.get("point_obj_type"));
         businessInspectionInfo.put("pointObjId", businessInspectionInfo.get("point_obj_id"));
         businessInspectionInfo.put("pointObjName", businessInspectionInfo.get("point_obj_name"));
+        businessInspectionInfo.put("itemId", businessInspectionInfo.get("item_id"));
+        businessInspectionInfo.put("nfcCode", businessInspectionInfo.get("nfc_code"));
         businessInspectionInfo.remove("bId");
         businessInspectionInfo.put("statusCd", statusCd);
     }
@@ -75,6 +77,8 @@ public abstract class AbstractInspectionBusinessServiceDataFlowListener extends
         currentInspectionInfo.put("pointObjType", currentInspectionInfo.get("point_obj_type"));
         currentInspectionInfo.put("pointObjId", currentInspectionInfo.get("point_obj_id"));
         currentInspectionInfo.put("pointObjName", currentInspectionInfo.get("point_obj_name"));
+        currentInspectionInfo.put("itemId", currentInspectionInfo.get("item_id"));
+        currentInspectionInfo.put("nfcCode", currentInspectionInfo.get("nfc_code"));
         getInspectionServiceDaoImpl().saveBusinessInspectionInfo(currentInspectionInfo);
 
         for (Object key : currentInspectionInfo.keySet()) {