优化 流转

java110-bean/src/main/java/com/java110/dto/equipmentAccount/EquipmentAccountDto.java

@@ -54,6 +54,8 @@ public class EquipmentAccountDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String url;
+
 
     public String getUseOrgName() {
         return useOrgName;
@@ -350,4 +352,12 @@ public class EquipmentAccountDto extends PageDto implements Serializable {
     public void setMachineTypeName(String machineTypeName) {
         this.machineTypeName = machineTypeName;
     }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
 }

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

@@ -45,6 +45,7 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String pointStartTime;
     private String pointEndTime;
     private String sortNumber;
+    private String pointObjId;
 
     //经度
     private String longitude;
@@ -392,4 +393,12 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setSendFlag(String sendFlag) {
         this.sendFlag = sendFlag;
     }
+
+    public String getPointObjId() {
+        return pointObjId;
+    }
+
+    public void setPointObjId(String pointObjId) {
+        this.pointObjId = pointObjId;
+    }
 }

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

@@ -139,6 +139,9 @@
         left join t_dict td5 on it.state = td5.status_cd and td5.table_name = 'inspection_task' and
         td5.table_columns = 'state'
         where 1 = 1
+        <if test="pointObjId !=null and pointObjId != ''">
+            and ip.point_obj_id = #{pointObjId}
+        </if>
         <if test="inspectionId !=null and inspectionId != ''">
             and t.inspection_id= #{inspectionId}
         </if>

service-common/src/main/java/com/java110/common/cmd/equipmentAccount/ListEquipmentAccountCmd.java

@@ -24,7 +24,9 @@ import com.java110.dto.equipmentAccount.EquipmentAccountDto;
 import com.java110.dto.machineType.MachineTypeDto;
 import com.java110.intf.common.IMachineTypeV1InnerServiceSMO;
 import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
@@ -60,6 +62,7 @@ public class ListEquipmentAccountCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson,"communityId","未包含小区");
     }
 
     @Override
@@ -70,6 +73,8 @@ public class ListEquipmentAccountCmd extends Cmd {
         int count = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccountsCount(equipmentAccountDto);
 
         List<EquipmentAccountDto> equipmentAccountDtos = null;
+        String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+
 
         if (count > 0) {
             equipmentAccountDtos = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccounts(equipmentAccountDto);
@@ -86,7 +91,12 @@ public class ListEquipmentAccountCmd extends Cmd {
                         continue;
                     }
                 }
+
+                ownerUrl += ("/#/pages/machine/machine?machineId="+equ.getMachineId()+"&communityId="+equ.getCommunityId());
+                equ.setUrl(ownerUrl);
             }
+
+
         } else {
             equipmentAccountDtos = new ArrayList<>();
         }