Browse Source

新增项目暂停增加变更判断

anderx 3 years ago
parent
commit
aa625eb415

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -994,7 +994,7 @@
       a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,a.task_receiver taskReceiver,b.patent_transfer patentTransfer,
       a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,e.contacts ,b.`type` bpType,
       date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
-      date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
+      date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,e.delete_sign deleteSign,
       date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDate,e.legal_person as legalPerson,
       e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,a.patent_type patentType,
       a.if_certification_fee ifCertificationFee , a.certification_corporate certificationCorporate ,a.certification_fee certificationFee ,a.time_record timeRecord,

+ 10 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -41,6 +41,7 @@ public class TOrderTaskDetailBo {
 	private String postalAddress;
 	private Integer declarationBatch;
 	private Integer ifCertificationFee;
+	private Integer deleteSign;
 	private String certificationCorporate;
 	private BigDecimal certificationFee;
 
@@ -124,6 +125,15 @@ public class TOrderTaskDetailBo {
 	private Integer processStatus;
 	private String commodityId;
 
+
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+
+	public void setDeleteSign(Integer deleteSign) {
+		this.deleteSign = deleteSign;
+	}
+
 	public String getCommodityId() {
 		return commodityId;
 	}

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

@@ -1467,6 +1467,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if (use!=null){
 				throw new BusinessException(String.format("项目[%s]暂停流程已存在,请先走完流程",id));
 			}
+			TOrderTaskDetailBo orderOp = tOrderTaskMapper.getOrderTaskDetail(id);
+
+			if (orderOp.getDeleteSign()==2){
+				throw new BusinessException(String.format("订单[%s]存在变更审核,请先走完流程",orderOp.getOrderNo()));
+			}
 			TaskStop ts = new TaskStop();
 			ts.setTid(id);
 			ts.setType(in.getType());