优化 报修回访刷新定时任务

java110-bean/src/main/java/com/java110/dto/workflowAuditMessage/WorkflowAuditMessageDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.workflowAuditMessage;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,17 +15,25 @@ import java.util.Date;
  **/
 public class WorkflowAuditMessageDto extends PageDto implements Serializable {
 
+    //分片类型 2020 根据小区分片 3030 根据商户ID
+    public static final String SHARE_TYPE_COMMUNITY = "2020";
+    public static final String SHARE_TYPE_STORE = "3030";
+    public static final String BUSINESS_TYPE_SHOP = "001"; //商铺
+
+    public static final String STATE_Y = "1100"; // 同意
+    public static final String STATE_N = "1200"; //不统一
+
     private String auditId;
-private String preAuditId;
-private String businessKey;
-private String auditPersonId;
-private String auditPerson;
-private String shareId;
-private String state;
-private String businessType;
-private String message;
-private String shareType;
-private String auditLink;
+    private String preAuditId;
+    private String businessKey;
+    private String auditPersonId;
+    private String auditPerson;
+    private String shareId;
+    private String state;
+    private String businessType;
+    private String message;
+    private String shareType;
+    private String auditLink;
 
 
     private Date createTime;
@@ -35,67 +44,88 @@ private String auditLink;
     public String getAuditId() {
         return auditId;
     }
-public void setAuditId(String auditId) {
+
+    public void setAuditId(String auditId) {
         this.auditId = auditId;
     }
-public String getPreAuditId() {
+
+    public String getPreAuditId() {
         return preAuditId;
     }
-public void setPreAuditId(String preAuditId) {
+
+    public void setPreAuditId(String preAuditId) {
         this.preAuditId = preAuditId;
     }
-public String getBusinessKey() {
+
+    public String getBusinessKey() {
         return businessKey;
     }
-public void setBusinessKey(String businessKey) {
+
+    public void setBusinessKey(String businessKey) {
         this.businessKey = businessKey;
     }
-public String getAuditPersonId() {
+
+    public String getAuditPersonId() {
         return auditPersonId;
     }
-public void setAuditPersonId(String auditPersonId) {
+
+    public void setAuditPersonId(String auditPersonId) {
         this.auditPersonId = auditPersonId;
     }
-public String getAuditPerson() {
+
+    public String getAuditPerson() {
         return auditPerson;
     }
-public void setAuditPerson(String auditPerson) {
+
+    public void setAuditPerson(String auditPerson) {
         this.auditPerson = auditPerson;
     }
-public String getShareId() {
+
+    public String getShareId() {
         return shareId;
     }
-public void setShareId(String shareId) {
+
+    public void setShareId(String shareId) {
         this.shareId = shareId;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getBusinessType() {
+
+    public String getBusinessType() {
         return businessType;
     }
-public void setBusinessType(String businessType) {
+
+    public void setBusinessType(String businessType) {
         this.businessType = businessType;
     }
-public String getMessage() {
+
+    public String getMessage() {
         return message;
     }
-public void setMessage(String message) {
+
+    public void setMessage(String message) {
         this.message = message;
     }
-public String getShareType() {
+
+    public String getShareType() {
         return shareType;
     }
-public void setShareType(String shareType) {
+
+    public void setShareType(String shareType) {
         this.shareType = shareType;
     }
-public String getAuditLink() {
+
+    public String getAuditLink() {
         return auditLink;
     }
-public void setAuditLink(String auditLink) {
+
+    public void setAuditLink(String auditLink) {
         this.auditLink = auditLink;
     }
 

java110-bean/src/main/java/com/java110/po/owner/RepairPoolPo.java

@@ -26,6 +26,7 @@ public class RepairPoolPo implements Serializable {
     private String repairObjType;
     private String repairObjId;
     private String repairObjName;
+    private String statusCd ;
 
 
     public String getRepairId() {
@@ -123,4 +124,12 @@ public class RepairPoolPo implements Serializable {
     public void setRepairObjName(String repairObjName) {
         this.repairObjName = repairObjName;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/workflowAuditMessage/WorkflowAuditMessagePo.java

@@ -1,95 +1,117 @@
 package com.java110.po.workflowAuditMessage;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class WorkflowAuditMessagePo implements Serializable {
 
     private String auditId;
-private String preAuditId;
-private String businessKey;
-private String auditPersonId;
-private String auditPerson;
-private String shareId;
-private String statusCd = "0";
-private String state;
-private String businessType;
-private String message;
-private String shareType;
-private String auditLink;
-public String getAuditId() {
+    private String preAuditId;
+    private String businessKey;
+    private String auditPersonId;
+    private String auditPerson;
+    private String shareId;
+    private String statusCd = "0";
+    private String state;
+    private String businessType;
+    private String message;
+    private String shareType;
+    private String auditLink;
+
+    public String getAuditId() {
         return auditId;
     }
-public void setAuditId(String auditId) {
+
+    public void setAuditId(String auditId) {
         this.auditId = auditId;
     }
-public String getPreAuditId() {
+
+    public String getPreAuditId() {
         return preAuditId;
     }
-public void setPreAuditId(String preAuditId) {
+
+    public void setPreAuditId(String preAuditId) {
         this.preAuditId = preAuditId;
     }
-public String getBusinessKey() {
+
+    public String getBusinessKey() {
         return businessKey;
     }
-public void setBusinessKey(String businessKey) {
+
+    public void setBusinessKey(String businessKey) {
         this.businessKey = businessKey;
     }
-public String getAuditPersonId() {
+
+    public String getAuditPersonId() {
         return auditPersonId;
     }
-public void setAuditPersonId(String auditPersonId) {
+
+    public void setAuditPersonId(String auditPersonId) {
         this.auditPersonId = auditPersonId;
     }
-public String getAuditPerson() {
+
+    public String getAuditPerson() {
         return auditPerson;
     }
-public void setAuditPerson(String auditPerson) {
+
+    public void setAuditPerson(String auditPerson) {
         this.auditPerson = auditPerson;
     }
-public String getShareId() {
+
+    public String getShareId() {
         return shareId;
     }
-public void setShareId(String shareId) {
+
+    public void setShareId(String shareId) {
         this.shareId = shareId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getBusinessType() {
+
+    public String getBusinessType() {
         return businessType;
     }
-public void setBusinessType(String businessType) {
+
+    public void setBusinessType(String businessType) {
         this.businessType = businessType;
     }
-public String getMessage() {
+
+    public String getMessage() {
         return message;
     }
-public void setMessage(String message) {
+
+    public void setMessage(String message) {
         this.message = message;
     }
-public String getShareType() {
+
+    public String getShareType() {
         return shareType;
     }
-public void setShareType(String shareType) {
+
+    public void setShareType(String shareType) {
         this.shareType = shareType;
     }
-public String getAuditLink() {
+
+    public String getAuditLink() {
         return auditLink;
     }
-public void setAuditLink(String auditLink) {
+
+    public void setAuditLink(String auditLink) {
         this.auditLink = auditLink;
     }
 
 
-
 }

service-job/src/main/java/com/java110/job/task/repair/ReturnVisitRepairTemplate.java

@@ -7,6 +7,8 @@ import com.java110.intf.community.IRepairInnerServiceSMO;
 import com.java110.intf.community.IRepairTypeUserInnerServiceSMO;
 import com.java110.job.quartz.TaskSystemQuartz;
 import com.java110.po.owner.RepairPoolPo;
+import com.java110.utils.constant.StateConstant;
+import com.java110.utils.constant.StatusConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +63,7 @@ public class ReturnVisitRepairTemplate extends TaskSystemQuartz {
         repairDto.setStatess(new String[]{RepairDto.STATE_RETURN_VISIT, RepairDto.STATE_APPRAISE});
         repairDto.setReturnVisitFlag("001,002");
         repairDto.setPage(1);
-        repairDto.setRow(1000);
+        repairDto.setRow(100);
         //查询需要程序轮训派单 订单
         List<RepairDto> repairDtos = repairInnerServiceSMOImpl.queryRepairs(repairDto);
 
@@ -84,6 +86,7 @@ public class ReturnVisitRepairTemplate extends TaskSystemQuartz {
             RepairPoolPo repairPoolPo = new RepairPoolPo();
             repairPoolPo.setRepairId(tmpRepairDto.getRepairId());
             repairPoolPo.setState(RepairDto.STATE_COMPLATE);
+            repairPoolPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
             repairInnerServiceSMOImpl.updateRepair(repairPoolPo);
             return;
         }
@@ -92,6 +95,7 @@ public class ReturnVisitRepairTemplate extends TaskSystemQuartz {
             RepairPoolPo repairPoolPo = new RepairPoolPo();
             repairPoolPo.setRepairId(tmpRepairDto.getRepairId());
             repairPoolPo.setState(RepairDto.STATE_COMPLATE);
+            repairPoolPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
             repairInnerServiceSMOImpl.updateRepair(repairPoolPo);
             return;
         }

service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeMonthStatisticsInnerServiceSMOImpl.java

@@ -224,7 +224,7 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
         reportFeeMonthStatisticsDto.setCommunityId(tmpReportCarDto.getCommunityId());
         reportFeeMonthStatisticsDto.setConfigId(tmpReportFeeDto.getConfigId());
         reportFeeMonthStatisticsDto.setObjId(tmpReportFeeDto.getPayerObjId());
-        reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId());
+        //reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId());
         reportFeeMonthStatisticsDto.setObjType(tmpReportFeeDto.getPayerObjType());
         reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
         reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth() + "");
@@ -406,7 +406,7 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
         reportFeeMonthStatisticsDto.setCommunityId(reportRoomDto.getCommunityId());
         reportFeeMonthStatisticsDto.setConfigId(tmpReportFeeDto.getConfigId());
         reportFeeMonthStatisticsDto.setObjId(tmpReportFeeDto.getPayerObjId());
-        reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId());
+        //reportFeeMonthStatisticsDto.setFeeId(tmpReportFeeDto.getFeeId());
         reportFeeMonthStatisticsDto.setObjType(tmpReportFeeDto.getPayerObjType());
         reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
         reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth() + "");