Browse Source

Merge branch 'test' of jishutao/kede-server into master

anderx 2 years ago
parent
commit
7795f91dae

+ 2 - 1
src/main/java/com/goafanti/common/dao/OrderExamineMapper.java

@@ -112,7 +112,8 @@ public interface OrderExamineMapper {
      * @param transferId
      * @param type 0咨询师 1经理 2咨询师转交经理 3经理转交咨询师
      */
-	void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
+	void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type,
+                                 @Param("orderNo") String orderNo);
 
     /**
      * 删除变更更审核人

+ 5 - 2
src/main/java/com/goafanti/common/mapper/OrderExamineMapper.xml

@@ -302,7 +302,8 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByOrderNoAndAid">
-  update order_examine set status=1 where aid= #{aid} and order_no= #{orderNo} and type= #{type}
+  update order_examine set status=1
+  where aid= #{aid} and order_no= #{orderNo} and type= #{type}
   </update>
   <select id="checkCountStatus" resultType="java.lang.Integer">
   select count(*) from order_examine where order_no = #{orderNo}
@@ -341,8 +342,10 @@
      <if test="type==4">
        ,type=0
      </if>
-
 	where status=0 and aid= #{aid}
+	  <if test="orderNo !=null">
+	  and order_no=#{orderNo}
+      </if>
      <if test="type==0 or type==1">
        and type= #{type}
      </if>

+ 4 - 4
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -267,13 +267,13 @@ public class AsyncUtils {
 			//System.out.println("同咨询师");
 			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 0);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,0);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,0,null);
 			pushChangeProcessZXS(list);
 		}else if (useType.contains(AFTConstants.TECH)&&newType.contains(AFTConstants.TECH_MANAGER)){
 //			System.out.println("不同职业");
 			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 3);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,3);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,3,null);
 			List<Integer> list2 = newOrderChangeMapper.selectProcess(4, transferId);
 			//如果转交后订单全通过了,则变更+1
 			pushChangeProcessZXS(list);
@@ -284,7 +284,7 @@ public class AsyncUtils {
 			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 1);
 			tOrderTaskMapper.updateDimissionTransferManager(aid, transferId);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,1);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,1,null);
 			pushChangeProcessZXSJL(list);
 		}else if (useType.contains(AFTConstants.TECH_MANAGER)&&newType.contains(AFTConstants.TECH)){
 //			System.out.println("不同职业");
@@ -292,7 +292,7 @@ public class AsyncUtils {
 			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 4);
 			tOrderTaskMapper.updateDimissionTransferManager(aid, null);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,4);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,4,null);
 			List<Integer> list2 = newOrderChangeMapper.selectProcess(3, transferId);
 			pushChangeProcessZXSJL(list);
 			pushChangeProcessZXS(list2);

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

@@ -178,48 +178,53 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		orderExamineMapper.deleteByAidAndStatus(orderNo,null,null);
 		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTaskAll(orderNo,null);
 		for (TOrderTaskBo t : list) {
-			if (type==OrderChangeType.CB.getCode()||type==OrderChangeType.JXMBG.getCode()){
-				Integer receiverType=null;
-				if (t.getTaskReceiver()!=null){
-					//等于咨询师 做咨询新增
-					if (t.getTaskReceiver().equals(t.getConsultantId())) {
-						receiverType=0;
-						//等于经理做经理新增
-					}else if  (t.getTaskReceiver().equals(t.getManagerId())){
-						receiverType=1;
-					}
-				}
-				if (receiverType!=null){
-					OrderExamine o=new OrderExamine();
-					o.setAid(t.getTaskReceiver());
-					o.setOrderNo(orderNo);
-					o.setCreateTime(new Date());
-					o.setType(receiverType);//咨询师
-					o.setStatus(0);//正常
-					orderExamineMapper.insertSelective(o);
-				}
-			}else if (type==OrderChangeType.XMJJEBG.getCode()||type==OrderChangeType.TDBTK.getCode() ||
-						type==OrderChangeType.TDTK.getCode()){
-				if (t.getConsultantId()!=null) {
-					OrderExamine o=new OrderExamine();
-					o.setAid(t.getConsultantId());
-					o.setOrderNo(orderNo);
-					o.setCreateTime(new Date());
-					o.setType(0);//咨询师
-					o.setStatus(0);//正常
-					orderExamineMapper.insertSelective(o);
-				}
-				if (t.getManagerId()!=null) {
-					OrderExamine o=new OrderExamine();
-					o.setAid(t.getManagerId());
-					o.setOrderNo(orderNo);
-					o.setCreateTime(new Date());
-					o.setType(1);//咨询师经理
-					o.setStatus(0);//正常
-					orderExamineMapper.insertSelective(o);
+			addOrderExamineByTask(orderNo, type, t);
+		}
+	}
+
+	private void addOrderExamineByTask(String orderNo, Integer type, TOrderTaskBo t) {
+		//重报和仅项目变更只需要当事人审核
+		if (type ==OrderChangeType.CB.getCode()|| type ==OrderChangeType.JXMBG.getCode()){
+			Integer receiverType=null;
+			if (t.getTaskReceiver()!=null){
+				//等于咨询师 做咨询新增
+				if (t.getTaskReceiver().equals(t.getConsultantId())) {
+					receiverType=0;
+					//等于经理做经理新增
+				}else if  (t.getTaskReceiver().equals(t.getManagerId())){
+					receiverType=1;
 				}
 			}
-
+			if (receiverType!=null){
+				OrderExamine o=new OrderExamine();
+				o.setAid(t.getTaskReceiver());
+				o.setOrderNo(orderNo);
+				o.setCreateTime(new Date());
+				o.setType(receiverType);//咨询师
+				o.setStatus(0);//正常
+				orderExamineMapper.insertSelective(o);
+			}
+			//项目及金额、退单不退款、退单退款需要当事人和经理审核,其他不需要咨询师审核
+		}else if (type ==OrderChangeType.XMJJEBG.getCode()|| type ==OrderChangeType.TDBTK.getCode() ||
+					type ==OrderChangeType.TDTK.getCode()){
+			if (t.getConsultantId()!=null) {
+				OrderExamine o=new OrderExamine();
+				o.setAid(t.getConsultantId());
+				o.setOrderNo(orderNo);
+				o.setCreateTime(new Date());
+				o.setType(0);//咨询师
+				o.setStatus(0);//正常
+				orderExamineMapper.insertSelective(o);
+			}
+			if (t.getManagerId()!=null) {
+				OrderExamine o=new OrderExamine();
+				o.setAid(t.getManagerId());
+				o.setOrderNo(orderNo);
+				o.setCreateTime(new Date());
+				o.setType(1);//咨询师经理
+				o.setStatus(0);//正常
+				orderExamineMapper.insertSelective(o);
+			}
 		}
 	}
 

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

@@ -191,7 +191,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 */
 	private void pushTaskChange(String aid, String taskReceiverId,Integer type,String orderNo) {
 		if (type==1||type==3){
-			orderExamineMapper.updateDimissionTransfer(aid,taskReceiverId,null);
+			orderExamineMapper.updateDimissionTransfer(aid,taskReceiverId,null,orderNo);
 		}else if (type==2){
 			OrderExamine o=new OrderExamine();
 			o.setAid(taskReceiverId);

+ 11 - 0
src/main/java/com/goafanti/organization/bo/InputPaymentList.java

@@ -14,9 +14,20 @@ public class InputPaymentList {
 	private String thchId;
 	private Integer status;
 	private Integer chooseType;
+	/**
+	 * 查看权限 0=财务专员 1=财务经理 2=管理层 3=咨询师与经理 4=专利管理员
+	 */
+	private Integer permissionsGrade;
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public Integer getPermissionsGrade() {
+		return permissionsGrade;
+	}
+
+	public void setPermissionsGrade(Integer permissionsGrade) {
+		this.permissionsGrade = permissionsGrade;
+	}
 
 	public String getThchId() {
 		return thchId;

+ 31 - 16
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -13,6 +13,7 @@ import java.util.UUID;
 import javax.servlet.http.HttpServletResponse;
 
 import com.goafanti.admin.service.DepartmentService;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
 import com.goafanti.order.enums.ProjectType;
 import org.apache.commons.beanutils.BeanUtils;
@@ -677,25 +678,39 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		if (i.getCname()!=null)map.put("cname", i.getCname());
 		if (i.getPname()!=null)map.put("pname", i.getPname());
 		if (i.getStatus()!=null)map.put("status", i.getStatus());
-		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
-			map.put("lvl", 1);
-		}else if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
-				TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
-				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
-			map.put("lvl", 2);
-		}else  if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)) {
-			map.put("lvl", 3);
-		}else if(TokenManager.hasRole(AFTConstants.PATENT_AUDITOR))
-		{
-			map.put("lvl", 4);
-		}else {
-			map.put("lvl", 0);
-		}
+		permissionsGrade(i, map);
 		Pagination<outPaymentList> p=(Pagination<outPaymentList>)findPage("selectPaymentList","selectPaymentCount",
 				map,i.getPageNo(),i.getPageSize());
 		return p;
 	}
 
+	/**
+	 * 设置查看逻辑
+	 * @param i
+	 * @param map
+	 */
+	private void permissionsGrade(InputPaymentList i, Map<String, Object> map) {
+		//0=财务专员 1=财务经理 2=管理层 3=咨询师与经理 4=专利管理员
+		Integer lvl=0;
+		if(i.getPermissionsGrade()!=null)lvl= i.getPermissionsGrade();
+		//1和2都为查看用角色区分
+		if (lvl==1){
+			//这些角色可以查看全部,反之不能,所以取反
+			if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
+				//财务经理查看
+				lvl=1;
+			}else if (((TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
+					TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+					TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)))){
+				lvl=2;
+			}else {
+				throw new BusinessException("查询异常");
+
+			}
+		}
+		map.put("lvl",lvl);
+	}
+
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -987,7 +1002,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				list2.add(out2);
 			}
 			NewExcelUtil<outPaymentListFinance> excelUtil=new NewExcelUtil<>(outPaymentListFinance.class);
-			return excelUtil.exportExcel(list2, "财务成本列表", response);
+			return excelUtil.exportExcel(list2, "财务成本列表");
 		}else {
 			List<outPaymentListPatent> list3=new ArrayList<outPaymentListPatent>();
 			for (outPaymentList out : list) {
@@ -1012,7 +1027,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 					list3.add(out3);
 			}
 			NewExcelUtil<outPaymentListPatent> p=new NewExcelUtil<>(outPaymentListPatent.class);
-			return p.exportExcel(list3, "专利成本列表", response);
+			return p.exportExcel(list3, "专利成本列表");
 		}
 	}
 

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

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.66
+static.host=//static.jishutao.com/1.2.67
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -49,7 +49,7 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.2.66
+static.host=//static.jishutao.com/1.2.67
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 rd.static.host=//static.jishutao.com/RD/1.0.00