加入二维码巡检功能

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

@@ -29,6 +29,7 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String routeName;
     private String actUserName;
     private String planUserName;
+    private String planUserId;
     private String signType;
     private String signTypeName;
     private String inspectionPlanId;
@@ -361,4 +362,12 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setItemId(String itemId) {
         this.itemId = itemId;
     }
+
+    public String getPlanUserId() {
+        return planUserId;
+    }
+
+    public void setPlanUserId(String planUserId) {
+        this.planUserId = planUserId;
+    }
 }

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

@@ -28,6 +28,8 @@ public class ApiInspectionPointDataVo implements Serializable {
     private String itemName;
     private String nfcCode;
 
+    private String url;
+
     public String getInspectionId() {
         return inspectionId;
     }
@@ -211,4 +213,12 @@ public class ApiInspectionPointDataVo implements Serializable {
     public void setItemName(String itemName) {
         this.itemName = itemName;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }

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

@@ -189,6 +189,9 @@
         <if test="planUserName !=null and planUserName != ''">
             and it.plan_user_name= #{planUserName}
         </if>
+        <if test="planUserId !=null and planUserId != ''">
+            and it.plan_user_id= #{planUserId}
+        </if>
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
             and ipl.inspection_plan_name= #{inspectionPlanName}
         </if>
@@ -336,6 +339,9 @@
         <if test="planUserName !=null and planUserName != ''">
             and it.plan_user_name= #{planUserName}
         </if>
+        <if test="planUserId !=null and planUserId != ''">
+            and it.plan_user_id= #{planUserId}
+        </if>
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
             and ipl.inspection_plan_name= #{inspectionPlanName}
         </if>

service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java

@@ -14,6 +14,7 @@ import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.community.IInspectionInnerServiceSMO;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.ServiceCodeInspectionPointConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -105,7 +106,7 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
         if (count > 0) {
             inspectionPoints = BeanConvertUtil.covertBeanList(inspectionPointInnerServiceSMOImpl.getInspectionRelationShip(inspectionPointDto), ApiInspectionPointDataVo.class);
             // 刷新 位置信息
-            //refreshMachines(inspectionPoints);
+            refreshInspections(inspectionPoints);
         } else {
             inspectionPoints = new ArrayList<>();
         }
@@ -121,6 +122,17 @@ public class ListInspectionPointsListener extends AbstractServiceApiListener {
         context.setResponseEntity(responseEntity);
     }
 
+    private void refreshInspections(List<ApiInspectionPointDataVo> inspectionPoints) {
+        String staffWechatUrl = MappingCache.getValue("STAFF_WECHAT_URL");
+        for (ApiInspectionPointDataVo apiInspectionPointDataVo : inspectionPoints) {
+            apiInspectionPointDataVo.setUrl(staffWechatUrl
+                    + "pages/excuteOneQrCodeInspection/excuteOneQrCodeInspection?inspectionId="
+                    + apiInspectionPointDataVo.getInspectionId()
+                    + "&inspectionName=" + apiInspectionPointDataVo.getInspectionName()
+                    + "&itemId=" + apiInspectionPointDataVo.getItemId());
+        }
+    }
+
     /**
      * 普通查询
      *