Sfoglia il codice sorgente

Merge branch 'test'

yangzian 3 anni fa
parent
commit
476b6ce7cf

+ 43 - 20
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.gson.JsonObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.shiro.SecurityUtils;
@@ -251,26 +252,43 @@ public class CwjsPolicyInfoController {
 				 if (examineUser.getString("departName").contains("销售")) {
 					 //华北 ---> 自动转老板
 					 if (cwjsPolicyInfo.getCompanyId().equals("d57fecdcf7a94d009736d9c850731582")) {
-						 //查询 是否符合条件
-						 List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
-								 cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
-						 if (!Check.isNull(autoConveryList)) {
-							 cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
-							 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
-							 log.info("-----自动转老板");
-							 return Result.successMsg("审核通过", cwjsPolicyInfo);
-						 } else {
-							 //结束
-							 cwjsPolicyInfo.setApprovedStatus(3);
-							 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
-
-							 /**
-							  * 终审通过后 添加 起始时间
-							  */
-							 reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
-							 return Result.successMsg("审核通过", cwjsPolicyInfo);
+
+					 	//审核人 如果是 赵旺 则需要单独处理 转审上级 丁兆明
+						 //查询审核人 上级
+						 JSONObject jsonObject = cwjsPolicyInfoMapper.getUserLeaderByUserId(cwjsPolicyInfo.getApprovedProgress());
+						 if (!Check.isNull(jsonObject) &&
+								 (StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(),"1431197153409228801")
+										 || StringUtils.equals(cwjsPolicyInfo.getApprovedProgress(),"7fb2684c348341d193727e791c75dbeb"))){
+
+							 // 下一步审核人
+							 cwjsPolicyInfo.setApprovedStatus(1);
+							 cwjsPolicyInfo.setApprovedProgress(jsonObject.getString("leaderId"));    //设置一下个审核人员
+
+						 }else {
+							 //查询 是否符合条件
+							 List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
+									 cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
+							 if (!Check.isNull(autoConveryList)) {
+								 cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
+								 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
+								 log.info("-----自动转老板");
+								 return Result.successMsg("审核通过", cwjsPolicyInfo);
+							 } else {
+								 //结束
+								 cwjsPolicyInfo.setApprovedStatus(3);
+								 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
+
+								 /**
+								  * 终审通过后 添加 起始时间
+								  */
+								 reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
+								 return Result.successMsg("审核通过", cwjsPolicyInfo);
+
+							 }
 
 						 }
+
+
 					 } else {
 						 // 下一步审核 分公司总经理
 						 cwjsPolicyInfo.setApprovedStatus(1);
@@ -295,7 +313,7 @@ public class CwjsPolicyInfoController {
 			 }
 
 			 //老板
-			 if (approvalUser.equals(userId) && userId.equals("4aba62011120ac565c7f2b9f8f4aa96b")) {
+			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")) {
 				 cwjsPolicyInfo.setApprovedStatus(3);
 				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
@@ -456,6 +474,11 @@ public class CwjsPolicyInfoController {
 
 				if (StringUtils.equals("saleDirector",createRoleCode)){
 					directorUserId  = cwjsPolicy.getCreateUserId();
+				}else if(StringUtils.equals("1431197153409228801",examineUser.getString("leaderId")) ||
+						StringUtils.equals("7fb2684c348341d193727e791c75dbeb",examineUser.getString("leaderId"))) {
+					//当前审核人是 zhaowang 则下一步审核人是 dingzhaoming
+					directorUserId  = "08b7c7ba1f0c4f8abb6aa098452fd921";
+
 				}else {
 					directorUserId = examineUser.getString("leaderId");
 				}
@@ -472,7 +495,7 @@ public class CwjsPolicyInfoController {
 				cwjsPolicy.setTheBossRight("no");
 				if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
 					if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
-							&& !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)){
+							&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
 
 						if(examineUser.getString("departName").contains("渠道")){
 							cwjsPolicy.setTheBossRight("yes");

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyApprovalLogMapper.xml

@@ -36,7 +36,7 @@
     <select id="getBossOneByPolicyId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
         select * from ctop_cwjs_policy_approval_log
         where policy_id = #{policyId}
-          and create_user_id = '4aba62011120ac565c7f2b9f8f4aa96b'
+          and create_user_id = '80e747cdea6f41dbbc8cde23046fd4e0'
         order by create_time desc
             LIMIT 1
     </select>

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -189,8 +189,8 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
     @Override
     public void automaticConveyBossExamine(CwjsPolicyInfo cwjsPolicyInfo) {
         cwjsPolicyInfo.setApprovedStatus(2);
-        cwjsPolicyInfo.setApprovedProgress("4aba62011120ac565c7f2b9f8f4aa96b");	//设置 boss 为审核人员
-        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("4aba62011120ac565c7f2b9f8f4aa96b");
+        cwjsPolicyInfo.setApprovedProgress("80e747cdea6f41dbbc8cde23046fd4e0");	//设置 boss 为审核人员
+        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
         StringBuilder text = new StringBuilder();
         text.append("您有一条销售政策需要审核,该客户为:");
         text.append(cwjsPolicyInfo.getCompanyName());