Explorar el Código

订单流程列表修改

anderx hace 2 años
padre
commit
718a7549e2

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

@@ -782,8 +782,9 @@
       a.soft_cost softCost ,a.soft_cost_actual softCostActual ,a.audit_cost auditCost ,a.audit_cost_actual auditCostActual ,a.other_cost otherCost ,
       a.other_cost_actual otherCostActual , a.expect_profit expectProfit ,a.actual_profit  actualProfit,a.service_type serviceType,
       a.service_project serviceProject,o.examine_name examineName
-    from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
-    left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2,4,5,7,8)
+    from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id
+        left join t_order_mid a on o.order_no=a.order_no
+    left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and o.approval in(0,1,2,4,5,7,8)
     and outsource=   #{o.outsource,jdbcType=INTEGER}
     <if test="o.processStatus == 3">
       and o.process_status = #{o.processStatus,jdbcType=INTEGER}
@@ -955,9 +956,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
     select o.order_no orderNo ,o.salesman_id as salesmanId, a.name as salesmanName,e.name managerName,
            o.contract_no contractNo,a.email ,u.nickname as userName,o.order_dep orderDep,d.name departmentName,
-           d.finance_id  financeId
+           d.finance_id  financeId,d.approval approvalStatus,d.approval_aid,ad.name approvalName
     from t_order_new o left join admin a on o.salesman_id = a.id left join `user` u on u.id = o.buyer_id
     left join department d on o.order_dep=d.id left join admin e on a.manager_id=e.id
+    left join admin ad on d.approval_aid=ad.id
     where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
 

+ 3 - 3
src/main/java/com/goafanti/order/bo/OrderProcessName.java

@@ -9,16 +9,16 @@ public class OrderProcessName {
     private String yxjl;
     private String yxgly;
     private String cwzy;
-    private String approvalStatus;
+    private Integer approvalStatus;
     private String approvalName;
     private String zxsgly;
     private String dsz;
 
-    public String getApprovalStatus() {
+    public Integer getApprovalStatus() {
         return approvalStatus;
     }
 
-    public void setApprovalStatus(String approvalStatus) {
+    public void setApprovalStatus(Integer approvalStatus) {
         this.approvalStatus = approvalStatus;
     }
 

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

@@ -1,15 +1,14 @@
 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.model.TOrderNew;
 import com.goafanti.order.enums.NewOrderDunType;
 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{
 	private String id;
@@ -93,6 +92,33 @@ public class TOrderNewBo extends TOrderNew{
 	 */
 	private String addDeductionOther;
 
+	private Integer approvalStatus;
+	private String approvalAid;
+	private String approvalName;
+
+	public Integer getApprovalStatus() {
+		return approvalStatus;
+	}
+
+	public void setApprovalStatus(Integer approvalStatus) {
+		this.approvalStatus = approvalStatus;
+	}
+
+	public String getApprovalAid() {
+		return approvalAid;
+	}
+
+	public void setApprovalAid(String approvalAid) {
+		this.approvalAid = approvalAid;
+	}
+
+	public String getApprovalName() {
+		return approvalName;
+	}
+
+	public void setApprovalName(String approvalName) {
+		this.approvalName = approvalName;
+	}
 
 	public Integer getMyExamine() {
 		return myExamine;

+ 23 - 17
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -545,16 +545,15 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
 		List<String> aids = new ArrayList<>();
 		StringBuffer str= new StringBuffer();
+		boolean flag= false;
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 		if (new1.getApproval()==ApprovalNewState.ZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.ZCBH.getCode()) {
-			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			List<String> types=new ArrayList<>();
-			//总裁加助理
-			types.add(AFTConstants.CED);
-			types.add(AFTConstants.CED_ASSISTANT);
-			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
-				aids.add(admin.getId());
-				str=str.append(admin.getName()).append(",");
+			if (order.getApprovalStatus()==0){
+				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+				flag=true;
+			}else {
+				aids.add(order.getApprovalAid());
+				str=str.append(order.getApprovalName()).append(",");
 			}
 		}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
@@ -566,17 +565,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				aids.add(admin.getId());
 				str=str.append(admin.getName()).append(",");
 			}
-		}else if (new1.getApproval()==ApprovalNewState.FZCDSH.getCode()|| new1.getApproval()==ApprovalNewState.FZCBH.getCode()) {
-			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
-			List<String> types=new ArrayList<>();
-			//董事长加助理
-			types.add(AFTConstants.VICE_CED);
-			for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
-				aids.add(admin.getId());
-				str=str.append(admin.getName()).append(",");
-			}
 		}else  {
 			t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+		}
+
+		if (t.getProcessStatus()==ProcessStatus.YPZXSGLY.getCode()){
 			//设置发送邮件标识
 			order.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 			OrganizationListOut oo=departmentMapper.selectAllById(new1.getOrderDep());
@@ -589,6 +582,19 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//用与外部修改名称
 		t.setExamineName(str.substring(0,str.length()-1));
 		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), new1.getApproval());
+		if (flag){
+			addTorderLog(t,"未设置特批审核人员自动跳过审核");
+		}
+	}
+
+	private void addTorderLog(TOrderNew t, String str) {
+		boolean flag=judgeOrderExamine(t.getOrderNo());
+		TOrderLog tl=new TOrderLog();
+
+		tl.setProcess(ProcessStatus.YPZXSGLY.getCode());
+		tl.setOrderNo(t.getOrderNo());
+		tl.setRemarks(str);
+		tOrderLogMapper.insertSelective(tl);
 	}
 
 	private boolean judgeOrderExamine(String orderNo) {

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

@@ -1472,7 +1472,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (confirm==2) {
 			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCTG.getCode());
 			else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZTG.getCode());
-			else if (t2.getApproval()==ApprovalNewState.FZCDSH.getCode())t.setApproval(ApprovalNewState.FZCTG.getCode());
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				OrganizationListOut oo=departmentMapper.selectAllById(t2.getOrderDep());
 				t.setFinanceId(oo.getFinanceId());
@@ -2173,6 +2172,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public OrderProcessName getProcessName(String orderNo) {
 		OrderProcessName names=tOrderNewMapper.getProcessName(orderNo);
+		if (names.getApprovalStatus()==0){
+			names.setApprovalName("未设置特批审核人员");
+		}
 		return names;
 	}
 

+ 9 - 18
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -2,15 +2,20 @@ package com.goafanti.order.service.impl;
 
 
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.DepartmentMapper;
+import com.goafanti.common.model.Department;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.ProcessStatus;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PushOrderService {
     public static final String   DEFAULTS_URL="/image/noPermission.jpg";
+    @Autowired
+    private DepartmentMapper departmentMapper;
 
 
 
@@ -26,24 +31,11 @@ public class PushOrderService {
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ){
             return t.getContractPictureUrl();
-        }else if(TokenManager.hasRole(AFTConstants.CED)){
-            if (t.getApproval()== ApprovalNewState.ZCDSH.getCode()){
+        }else if(t.getApproval()==ApprovalNewState.ZCDSH.getCode()){
+            Department department = departmentMapper.selectByPrimaryKey(t.getOrderDep());
+            if (department.getApproval()==1&&department.getApprovalAid().equals(TokenManager.getAdminId())){
                 return  t.getContractPictureUrl();
-            }else  if (t.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
-                return DEFAULTS_URL;
-            }else {
-                return  t.getContractPictureUrl();
-            }
-        }else if(TokenManager.hasRole(AFTConstants.VICE_CED)){
-            if(t.getProcessStatus()== ProcessStatus.YPTPSH.getCode()){
-                if (t.getApproval()== ApprovalNewState.FZCDSH.getCode()){
-                    if (t.getSalesmanId().equals(AFTConstants.CAOJIN_AID)) {
-                        return DEFAULTS_URL;
-                    }
-                    return  t.getContractPictureUrl();
-                }
             }
-            return DEFAULTS_URL;
         }else if (TokenManager.hasRole(AFTConstants.SALESMAN)&&
                 TokenManager.getAdminId().equals(t.getSalesmanId())){
             return  t.getContractPictureUrl();
@@ -66,9 +58,8 @@ public class PushOrderService {
             return  t.getContractPictureUrl();
         }else if (TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
             return  t.getContractPictureUrl();
-        }else{
-            return DEFAULTS_URL;
         }
+            return DEFAULTS_URL;
     }
 
 

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20