Просмотр исходного кода

财务订单特批相关修改

anderx 1 год назад
Родитель
Сommit
00a5eb0578

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

@@ -819,7 +819,7 @@
         a.contract_picture_url contractPictureUrl, a.order_status as orderStatus, a.liquidation_status as liquidationStatus,
         a.approval,c.salesman_name as salesmanName,c.project_type projectType,dep.name as depName,c.finance_name as financeName,
         c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,a.sales_type salesType, a.channel_id channelId ,
-        a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExpalin
+        a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExplain
         <if test="specially == 2">
             ,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
         </if>

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

@@ -97,16 +97,16 @@ public class TOrderNewBo extends TOrderNew{
 	private String operationGuaranteeId;
 	private String operationGuaranteeName;
 
-	private String typeExpalin;
+	private String typeExplain;
 
 	private String type;
 
-	public String getTypeExpalin() {
-		return typeExpalin;
+	public String getTypeExplain() {
+		return typeExplain;
 	}
 
-	public void setTypeExpalin(String typeExpalin) {
-		this.typeExpalin = typeExpalin;
+	public void setTypeExplain(String typeExplain) {
+		this.typeExplain = typeExplain;
 	}
 
 	public String getType() {

+ 5 - 6
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -664,17 +664,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//删除
 			int index = 0;
 			for (TOrderApproval e : tOrderApprovals) {
-				Integer deleteId=null;
+				boolean flag=false;
 				for (String s : split) {
 					if (Integer.valueOf(s).equals(e.getType())){
-						deleteId=e.getId();
+						flag=true;
 						break;
 					}
 				}
-				if(deleteId!=null){
-					tOrderApprovalMapper.deleteByPrimaryKey(deleteId);
-				}
-				if(e.getType()==0&&index==0){
+				if(!flag){
+					tOrderApprovalMapper.deleteByPrimaryKey(e.getId());
+				}else if(e.getType()==0&&index==0){
 					index++;
 					if (t.getTypeExplain()!=null){
 						e.setTypeExplain(t.getTypeExplain());