Explorar el Código

订单项目状态修改接口修改

anderx hace 4 años
padre
commit
1905743ccc

+ 0 - 139
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -802,146 +802,7 @@ public class TOrderTask implements Serializable {
         this.pubicityUrl = pubicityUrl;
     }
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        TOrderTask other = (TOrderTask) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
-            && (this.getMain() == null ? other.getMain() == null : this.getMain().equals(other.getMain()))
-            && (this.getSuperId() == null ? other.getSuperId() == null : this.getSuperId().equals(other.getSuperId()))
-            && (this.getCommodityId() == null ? other.getCommodityId() == null : this.getCommodityId().equals(other.getCommodityId()))
-            && (this.getCommodityName() == null ? other.getCommodityName() == null : this.getCommodityName().equals(other.getCommodityName()))
-            && (this.getCommodityQuantity() == null ? other.getCommodityQuantity() == null : this.getCommodityQuantity().equals(other.getCommodityQuantity()))
-            && (this.getCommodityMode() == null ? other.getCommodityMode() == null : this.getCommodityMode().equals(other.getCommodityMode()))
-            && (this.getCommodityPrice() == null ? other.getCommodityPrice() == null : this.getCommodityPrice().equals(other.getCommodityPrice()))
-            && (this.getTaskStatus() == null ? other.getTaskStatus() == null : this.getTaskStatus().equals(other.getTaskStatus()))
-            && (this.getTaskDistributionTime() == null ? other.getTaskDistributionTime() == null : this.getTaskDistributionTime().equals(other.getTaskDistributionTime()))
-            && (this.getTaskAllocator() == null ? other.getTaskAllocator() == null : this.getTaskAllocator().equals(other.getTaskAllocator()))
-            && (this.getTaskReceiver() == null ? other.getTaskReceiver() == null : this.getTaskReceiver().equals(other.getTaskReceiver()))
-            && (this.getTaskComment() == null ? other.getTaskComment() == null : this.getTaskComment().equals(other.getTaskComment()))
-            && (this.getTaskStartTime() == null ? other.getTaskStartTime() == null : this.getTaskStartTime().equals(other.getTaskStartTime()))
-            && (this.getTaskEndTime() == null ? other.getTaskEndTime() == null : this.getTaskEndTime().equals(other.getTaskEndTime()))
-            && (this.getAttachmentUrl() == null ? other.getAttachmentUrl() == null : this.getAttachmentUrl().equals(other.getAttachmentUrl()))
-            && (this.getProjectStatus() == null ? other.getProjectStatus() == null : this.getProjectStatus().equals(other.getProjectStatus()))
-            && (this.getAcceptTime() == null ? other.getAcceptTime() == null : this.getAcceptTime().equals(other.getAcceptTime()))
-            && (this.getReviewTime() == null ? other.getReviewTime() == null : this.getReviewTime().equals(other.getReviewTime()))
-            && (this.getPublicityTime() == null ? other.getPublicityTime() == null : this.getPublicityTime().equals(other.getPublicityTime()))
-            && (this.getLicenceTime() == null ? other.getLicenceTime() == null : this.getLicenceTime().equals(other.getLicenceTime()))
-            && (this.getCertificateNumber() == null ? other.getCertificateNumber() == null : this.getCertificateNumber().equals(other.getCertificateNumber()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getFormRetrieve() == null ? other.getFormRetrieve() == null : this.getFormRetrieve().equals(other.getFormRetrieve()))
-            && (this.getTaskRefund() == null ? other.getTaskRefund() == null : this.getTaskRefund().equals(other.getTaskRefund()))
-            && (this.getRefundContent() == null ? other.getRefundContent() == null : this.getRefundContent().equals(other.getRefundContent()))
-            && (this.getRetrieveContent() == null ? other.getRetrieveContent() == null : this.getRetrieveContent().equals(other.getRetrieveContent()))
-            && (this.getDeclareUser() == null ? other.getDeclareUser() == null : this.getDeclareUser().equals(other.getDeclareUser()))
-            && (this.getDeclarePwd() == null ? other.getDeclarePwd() == null : this.getDeclarePwd().equals(other.getDeclarePwd()))
-            && (this.getSetUpAmount() == null ? other.getSetUpAmount() == null : this.getSetUpAmount().equals(other.getSetUpAmount()))
-            && (this.getArrivalMoney() == null ? other.getArrivalMoney() == null : this.getArrivalMoney().equals(other.getArrivalMoney()))
-            && (this.getOutsourceName() == null ? other.getOutsourceName() == null : this.getOutsourceName().equals(other.getOutsourceName()))
-            && (this.getOutsourcePrice() == null ? other.getOutsourcePrice() == null : this.getOutsourcePrice().equals(other.getOutsourcePrice()))
-            && (this.getConsultantId() == null ? other.getConsultantId() == null : this.getConsultantId().equals(other.getConsultantId()))
-            && (this.getManagerId() == null ? other.getManagerId() == null : this.getManagerId().equals(other.getManagerId()))
-            && (this.getOutsource() == null ? other.getOutsource() == null : this.getOutsource().equals(other.getOutsource()))
-            && (this.getSplitSuper() == null ? other.getSplitSuper() == null : this.getSplitSuper().equals(other.getSplitSuper()))
-            && (this.getSplitStatus() == null ? other.getSplitStatus() == null : this.getSplitStatus().equals(other.getSplitStatus()))
-            && (this.getSplitId() == null ? other.getSplitId() == null : this.getSplitId().equals(other.getSplitId()))
-            && (this.getSplitAid() == null ? other.getSplitAid() == null : this.getSplitAid().equals(other.getSplitAid()))
-            && (this.getSplitTime() == null ? other.getSplitTime() == null : this.getSplitTime().equals(other.getSplitTime()))
-            && (this.getCname() == null ? other.getCname() == null : this.getCname().equals(other.getCname()))
-            && (this.getReceiverName() == null ? other.getReceiverName() == null : this.getReceiverName().equals(other.getReceiverName()))
-            && (this.getDeclarationBatch() == null ? other.getDeclarationBatch() == null : this.getDeclarationBatch().equals(other.getDeclarationBatch()))
-            && (this.getCostReduction() == null ? other.getCostReduction() == null : this.getCostReduction().equals(other.getCostReduction()))
-            && (this.getOfficialCost() == null ? other.getOfficialCost() == null : this.getOfficialCost().equals(other.getOfficialCost()))
-            && (this.getSetUpStatus() == null ? other.getSetUpStatus() == null : this.getSetUpStatus().equals(other.getSetUpStatus()))
-            && (this.getSetUpTime() == null ? other.getSetUpTime() == null : this.getSetUpTime().equals(other.getSetUpTime()))
-            && (this.getSpotCheckStatus() == null ? other.getSpotCheckStatus() == null : this.getSpotCheckStatus().equals(other.getSpotCheckStatus()))
-            && (this.getHighTechStatus() == null ? other.getHighTechStatus() == null : this.getHighTechStatus().equals(other.getHighTechStatus()))
-            && (this.getSpecialComment() == null ? other.getSpecialComment() == null : this.getSpecialComment().equals(other.getSpecialComment()))
-            && (this.getIfCertificationFee() == null ? other.getIfCertificationFee() == null : this.getIfCertificationFee().equals(other.getIfCertificationFee()))
-            && (this.getCertificationFee() == null ? other.getCertificationFee() == null : this.getCertificationFee().equals(other.getCertificationFee()))
-            && (this.getCertificationCorporate() == null ? other.getCertificationCorporate() == null : this.getCertificationCorporate().equals(other.getCertificationCorporate()))
-            && (this.getTimeRecord() == null ? other.getTimeRecord() == null : this.getTimeRecord().equals(other.getTimeRecord()))
-            && (this.getIfPublicity() == null ? other.getIfPublicity() == null : this.getIfPublicity().equals(other.getIfPublicity()))
-            && (this.getCheckStatus() == null ? other.getCheckStatus() == null : this.getCheckStatus().equals(other.getCheckStatus()))
-            && (this.getPatentType() == null ? other.getPatentType() == null : this.getPatentType().equals(other.getPatentType()))
-            && (this.getPubicityUrl() == null ? other.getPubicityUrl() == null : this.getPubicityUrl().equals(other.getPubicityUrl()));
-    }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
-        result = prime * result + ((getMain() == null) ? 0 : getMain().hashCode());
-        result = prime * result + ((getSuperId() == null) ? 0 : getSuperId().hashCode());
-        result = prime * result + ((getCommodityId() == null) ? 0 : getCommodityId().hashCode());
-        result = prime * result + ((getCommodityName() == null) ? 0 : getCommodityName().hashCode());
-        result = prime * result + ((getCommodityQuantity() == null) ? 0 : getCommodityQuantity().hashCode());
-        result = prime * result + ((getCommodityMode() == null) ? 0 : getCommodityMode().hashCode());
-        result = prime * result + ((getCommodityPrice() == null) ? 0 : getCommodityPrice().hashCode());
-        result = prime * result + ((getTaskStatus() == null) ? 0 : getTaskStatus().hashCode());
-        result = prime * result + ((getTaskDistributionTime() == null) ? 0 : getTaskDistributionTime().hashCode());
-        result = prime * result + ((getTaskAllocator() == null) ? 0 : getTaskAllocator().hashCode());
-        result = prime * result + ((getTaskReceiver() == null) ? 0 : getTaskReceiver().hashCode());
-        result = prime * result + ((getTaskComment() == null) ? 0 : getTaskComment().hashCode());
-        result = prime * result + ((getTaskStartTime() == null) ? 0 : getTaskStartTime().hashCode());
-        result = prime * result + ((getTaskEndTime() == null) ? 0 : getTaskEndTime().hashCode());
-        result = prime * result + ((getAttachmentUrl() == null) ? 0 : getAttachmentUrl().hashCode());
-        result = prime * result + ((getProjectStatus() == null) ? 0 : getProjectStatus().hashCode());
-        result = prime * result + ((getAcceptTime() == null) ? 0 : getAcceptTime().hashCode());
-        result = prime * result + ((getReviewTime() == null) ? 0 : getReviewTime().hashCode());
-        result = prime * result + ((getPublicityTime() == null) ? 0 : getPublicityTime().hashCode());
-        result = prime * result + ((getLicenceTime() == null) ? 0 : getLicenceTime().hashCode());
-        result = prime * result + ((getCertificateNumber() == null) ? 0 : getCertificateNumber().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getFormRetrieve() == null) ? 0 : getFormRetrieve().hashCode());
-        result = prime * result + ((getTaskRefund() == null) ? 0 : getTaskRefund().hashCode());
-        result = prime * result + ((getRefundContent() == null) ? 0 : getRefundContent().hashCode());
-        result = prime * result + ((getRetrieveContent() == null) ? 0 : getRetrieveContent().hashCode());
-        result = prime * result + ((getDeclareUser() == null) ? 0 : getDeclareUser().hashCode());
-        result = prime * result + ((getDeclarePwd() == null) ? 0 : getDeclarePwd().hashCode());
-        result = prime * result + ((getSetUpAmount() == null) ? 0 : getSetUpAmount().hashCode());
-        result = prime * result + ((getArrivalMoney() == null) ? 0 : getArrivalMoney().hashCode());
-        result = prime * result + ((getOutsourceName() == null) ? 0 : getOutsourceName().hashCode());
-        result = prime * result + ((getOutsourcePrice() == null) ? 0 : getOutsourcePrice().hashCode());
-        result = prime * result + ((getConsultantId() == null) ? 0 : getConsultantId().hashCode());
-        result = prime * result + ((getManagerId() == null) ? 0 : getManagerId().hashCode());
-        result = prime * result + ((getOutsource() == null) ? 0 : getOutsource().hashCode());
-        result = prime * result + ((getSplitSuper() == null) ? 0 : getSplitSuper().hashCode());
-        result = prime * result + ((getSplitStatus() == null) ? 0 : getSplitStatus().hashCode());
-        result = prime * result + ((getSplitId() == null) ? 0 : getSplitId().hashCode());
-        result = prime * result + ((getSplitAid() == null) ? 0 : getSplitAid().hashCode());
-        result = prime * result + ((getSplitTime() == null) ? 0 : getSplitTime().hashCode());
-        result = prime * result + ((getCname() == null) ? 0 : getCname().hashCode());
-        result = prime * result + ((getReceiverName() == null) ? 0 : getReceiverName().hashCode());
-        result = prime * result + ((getDeclarationBatch() == null) ? 0 : getDeclarationBatch().hashCode());
-        result = prime * result + ((getCostReduction() == null) ? 0 : getCostReduction().hashCode());
-        result = prime * result + ((getOfficialCost() == null) ? 0 : getOfficialCost().hashCode());
-        result = prime * result + ((getSetUpStatus() == null) ? 0 : getSetUpStatus().hashCode());
-        result = prime * result + ((getSetUpTime() == null) ? 0 : getSetUpTime().hashCode());
-        result = prime * result + ((getSpotCheckStatus() == null) ? 0 : getSpotCheckStatus().hashCode());
-        result = prime * result + ((getHighTechStatus() == null) ? 0 : getHighTechStatus().hashCode());
-        result = prime * result + ((getSpecialComment() == null) ? 0 : getSpecialComment().hashCode());
-        result = prime * result + ((getIfCertificationFee() == null) ? 0 : getIfCertificationFee().hashCode());
-        result = prime * result + ((getCertificationFee() == null) ? 0 : getCertificationFee().hashCode());
-        result = prime * result + ((getCertificationCorporate() == null) ? 0 : getCertificationCorporate().hashCode());
-        result = prime * result + ((getTimeRecord() == null) ? 0 : getTimeRecord().hashCode());
-        result = prime * result + ((getIfPublicity() == null) ? 0 : getIfPublicity().hashCode());
-        result = prime * result + ((getCheckStatus() == null) ? 0 : getCheckStatus().hashCode());
-        result = prime * result + ((getPatentType() == null) ? 0 : getPatentType().hashCode());
-        result = prime * result + ((getPubicityUrl() == null) ? 0 : getPubicityUrl().hashCode());
-        return result;
-    }
 
     @Override
     public String toString() {

+ 4 - 1
src/main/java/com/goafanti/order/bo/UpdateProjectStatusBo.java

@@ -9,7 +9,7 @@ public class UpdateProjectStatusBo {
 	@NotNull(message = "项目编号必须指定") 
 	private Integer tid;
 	@NotNull(message = "项目状态必须指定")
-	Integer projectStatus;
+	private  Integer projectStatus;
 	
 	private String timeRecord;
 	
@@ -19,6 +19,9 @@ public class UpdateProjectStatusBo {
 
 	private String pubicityUrl;
 
+	public UpdateProjectStatusBo(){
+	}
+
 	public String getPubicityUrl() {
 		return pubicityUrl;
 	}

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -449,7 +449,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setProjectStatus(b.getProjectStatus());
 		t.setTimeRecord(b.getTimeRecord());
 		t.setCertificateNumber(b.getCertificateNumber());
-		t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
+		if(b.getSetUpAmount()!=null)t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
 		if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
 		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(b.getTid());//查询出项目信息
 		if(b.getProjectStatus()!=task2.getProjectStatus()){