Ver código fonte

政策-审核人修改为正式用户-master

yangzian 3 anos atrás
pai
commit
337d58c1b7

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

@@ -287,7 +287,7 @@ public class CwjsPolicyInfoController {
 			 }
 
 			 //老板
-			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")) {
+			 if (approvalUser.equals(userId) && userId.equals("4aba62011120ac565c7f2b9f8f4aa96b")) {
 				 cwjsPolicyInfo.setApprovedStatus(3);
 				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
@@ -464,7 +464,7 @@ public class CwjsPolicyInfoController {
 				cwjsPolicy.setTheBossRight("no");
 				if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
 					if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
-							&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
+							&& !"4aba62011120ac565c7f2b9f8f4aa96b".equals(userId)){
 
 						if(examineUser.getString("departName").contains("渠道")){
 							cwjsPolicy.setTheBossRight("yes");
@@ -948,7 +948,7 @@ public class CwjsPolicyInfoController {
 	 }
 
 
-	 //待修改
+
 	 @ApiOperation(value="政策作废", notes="政策作废")
 	 @GetMapping(value = "/toVoidpolicy")
 	 public Result toVoidpolicy(@RequestParam(name="policyId") String policyId,

+ 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 = '80e747cdea6f41dbbc8cde23046fd4e0'
+          and create_user_id = '4aba62011120ac565c7f2b9f8f4aa96b'
         order by create_time desc
             LIMIT 1
     </select>

+ 3 - 3
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("80e747cdea6f41dbbc8cde23046fd4e0");	//设置 boss 为审核人员
-        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
+        cwjsPolicyInfo.setApprovedProgress("4aba62011120ac565c7f2b9f8f4aa96b");	//设置 boss 为审核人员
+        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("4aba62011120ac565c7f2b9f8f4aa96b");
         StringBuilder text = new StringBuilder();
         text.append("您有一条销售政策需要审核,该客户为:");
         text.append(cwjsPolicyInfo.getCompanyName());
@@ -263,7 +263,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
 
         for (String userId : userList) {
             //给销售总监发送
-            JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("80e747cdea6f41dbbc8cde23046fd4e0");
+            JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(userId);
             StringBuilder text = new StringBuilder();
             text.append(cwjsPolicyInfo.getCreateUserName()+"创建的政策,客户为:"+cwjsPolicyInfo.getCompanyName());
             text.append(",该销售政策已作废。");