anderx лет назад: 2
Родитель
Сommit
ba197ce409

+ 14 - 6
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -1,15 +1,14 @@
 package com.goafanti.order.bo;
 package com.goafanti.order.bo;
 
 
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.OrderDunSubject;
 import com.goafanti.order.enums.OrderDunSubject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
 
 
 public class TOrderNewBo extends TOrderNew{
 public class TOrderNewBo extends TOrderNew{
 	private String id;
 	private String id;
@@ -94,6 +93,15 @@ public class TOrderNewBo extends TOrderNew{
 	private String addDeductionOther;
 	private String addDeductionOther;
 	private Integer approvalStatus;
 	private Integer approvalStatus;
 	private String approvalAid;
 	private String approvalAid;
+	private String approvalName;
+
+	public String getApprovalName() {
+		return approvalName;
+	}
+
+	public void setApprovalName(String approvalName) {
+		this.approvalName = approvalName;
+	}
 
 
 	public Integer getApprovalStatus() {
 	public Integer getApprovalStatus() {
 		return approvalStatus;
 		return approvalStatus;

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

@@ -552,7 +552,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				flag=true;
 				flag=true;
 			}else {
 			}else {
-				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 				aids.add(order.getApprovalAid());
 				aids.add(order.getApprovalAid());
 				str=str.append(order.getApprovalName()).append(",");
 				str=str.append(order.getApprovalName()).append(",");
 			}
 			}
@@ -584,7 +583,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		t.setExamineName(str.substring(0,str.length()-1));
 		t.setExamineName(str.substring(0,str.length()-1));
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
 		if (flag){
 		if (flag){
-			addTorderLog(t,"未设置特批审核人员自动跳过审核");
+			addTorderLog(t,"部门特批审核人未设置,系统自动通过");
 		}
 		}
 	}
 	}
 
 

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

@@ -400,7 +400,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (dep.getApproval()==1){
 			if (dep.getApproval()==1){
 				nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 				nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 			}else {
 			}else {
-				addOrderChangeLog("部门特批审核人未设置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
+				addOrderChangeLog("部门特批审核人置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
 				completeChange(remarks,nb);
 				completeChange(remarks,nb);
 				return true;
 				return true;
 			}
 			}

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

@@ -1406,7 +1406,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (flag){
 		if (flag){
 			addNoticMember(notice, ono, in.getType(),result);
 			addNoticMember(notice, ono, in.getType(),result);
 		}
 		}
-		if(appFlag)addMemberLog(in.getId(),status,"未设置特批账号,跳过特批审核",null);
+		if(appFlag)addMemberLog(in.getId(),status,"部门特批审核人未设置,系统自动通过",null);
 		return 1;
 		return 1;
 	}
 	}