yangzian пре 3 година
родитељ
комит
88417f2dd0

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

@@ -197,6 +197,14 @@ public class CwjsPolicyInfoController {
 		 	if(approvalUser.equals(examineUser.getString("leaderId"))){
 		 		if(examineUser.getString("departName").contains("渠道")){
 					cwjsPolicyInfo.setApprovedStatus(3);
+
+					CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
+					policyApprovalLog.setPolicyId(id);
+					policyApprovalLog.setCreateUserId(userId);
+					policyApprovalLog.setApprovalStatus(0);
+					policyApprovalLog.setApprovalContent(approvalContent);
+					policyApprovalLogService.save(policyApprovalLog);
+
 					/**
 					 * 终审通过后 添加 起始时间
 					 */
@@ -219,6 +227,14 @@ public class CwjsPolicyInfoController {
 							//结束
 							cwjsPolicyInfo.setApprovedStatus(3);
 							cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
+
+							CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
+							policyApprovalLog.setPolicyId(id);
+							policyApprovalLog.setCreateUserId(userId);
+							policyApprovalLog.setApprovalStatus(0);
+							policyApprovalLog.setApprovalContent(approvalContent);
+							policyApprovalLogService.save(policyApprovalLog);
+
 							/**
 							 * 终审通过后 添加 起始时间
 							 */
@@ -240,6 +256,31 @@ public class CwjsPolicyInfoController {
 			 if(approvalUser.equals(examineUser.getString("directorId"))){
 				 cwjsPolicyInfo.setApprovedStatus(3);
 				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
+
+				 CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
+				 policyApprovalLog.setPolicyId(id);
+				 policyApprovalLog.setCreateUserId(userId);
+				 policyApprovalLog.setApprovalStatus(0);
+				 policyApprovalLog.setApprovalContent(approvalContent);
+				 policyApprovalLogService.save(policyApprovalLog);
+
+				 /**
+				  * 终审通过后 添加 起始时间
+				  */
+				 reportSettlementService.cwjsPRofit(cwjsPolicyInfo);
+				 return Result.successMsg("成功",cwjsPolicyInfo);
+			 }
+
+			 //老板
+			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
+				 cwjsPolicyInfo.setApprovedStatus(3);
+				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
+				 CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
+				 policyApprovalLog.setPolicyId(id);
+				 policyApprovalLog.setCreateUserId(userId);
+				 policyApprovalLog.setApprovalStatus(3);
+				 policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "暂无" : approvalContent);
+				 policyApprovalLogService.save(policyApprovalLog);
 				 /**
 				  * 终审通过后 添加 起始时间
 				  */
@@ -248,6 +289,8 @@ public class CwjsPolicyInfoController {
 			 }
 
 
+
+
 			 JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfo.getApprovedProgress());
 			 StringBuilder text = new StringBuilder();
 			 text.append("您有一条销售政策需要审核,该客户为:");
@@ -265,13 +308,22 @@ public class CwjsPolicyInfoController {
 		}
 	 	if(type == 3){	//审核拒绝	给申请人发企业微信
 			cwjsPolicyInfo.setApprovedStatus(4);
+
 			CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
+			//老板
+			if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
+				policyApprovalLog.setApprovalStatus(3);
+
+			}else {
+				policyApprovalLog.setApprovalStatus(1);
+			}
+
 			policyApprovalLog.setPolicyId(id);
 			policyApprovalLog.setCreateUserId(userId);
 			policyApprovalLog.setApprovalContent(approvalContent);
-			policyApprovalLog.setApprovalStatus(1);
 			policyApprovalLogService.save(policyApprovalLog);
 
+
 			JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId(cwjsPolicyInfo.getCreateUserId());
 			StringBuilder text = new StringBuilder();
 			text.append("您有一条销售政策审核未通过,客户为:");
@@ -361,13 +413,17 @@ public class CwjsPolicyInfoController {
 
 		cwjsPolicyInfos.forEach(cwjsPolicy ->{
 			CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),1);	// 查询 被拒 审核意见 最新的一条
-			cwjsPolicy.setApprovalContent(Check.isNull(log) ? "暂无被拒意见" : log.getApprovalContent());
+			cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
 
-			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2);	// 查询 转发领导的 审核意见 最新的一条
-			cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "暂无老板审核意见" : bossContent.getApprovalContent());
+			/*
+			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2);	// 查询 手动转发领导的 审核意见 最新的一条
+			cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
+			*/
+			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId(),3);	// 查询 老板 审核意见 最新的一条
+			cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
 
 			CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(cwjsPolicy.getId());	// 查询 法务 审核意见 最新的一条
-			cwjsPolicy.setLegalAffairsContent(Check.isNull(legalContent) ? "暂无法务审核意见" : legalContent.getApprovalContent());
+			cwjsPolicy.setLegalAffairsContent(Check.isNull(legalContent) ? "" : legalContent.getApprovalContent());
 
 
 			String directorUserId = "";

+ 7 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyApprovalLogMapper.java

@@ -29,4 +29,11 @@ public interface CwjsPolicyApprovalLogMapper extends BaseMapper<CwjsPolicyApprov
      * @return
      */
     CwjsPolicyApprovalLog getOneByPolicyLegalInfo(@Param("policyId") Integer policyId);
+
+    /**
+     * 根据政策id 查询 老板审核意见记录
+     * @param policyId
+     * @return
+     */
+    CwjsPolicyApprovalLog getBossOneByPolicyId(@Param("policyId") Integer policyId,@Param("status") Integer status);
 }

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

@@ -3,11 +3,12 @@
 <mapper namespace="org.jeecg.ctop.finance.policy.mapper.CwjsPolicyApprovalLogMapper">
 
 
-    <!-- 根据政策id 查询 审核意见记录  -->
+    <!-- 根据政策id 查询 审核意见记录  手动转给领导的审核意见 不包含自动转 -->
     <select id="getOneByPolicyId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
         select * from ctop_cwjs_policy_approval_log
         where policy_id = #{policyId}
           and approval_status = #{status}
+        and approval_content != '转审领导。'
         order by create_time desc
         LIMIT 1
     </select>
@@ -30,6 +31,18 @@
 
 
 
+    <!-- 根据政策id 查询 老板审核意见记录   -->
+    <select id="getBossOneByPolicyId" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
+        select * from ctop_cwjs_policy_approval_log
+        where policy_id = #{policyId}
+          and approval_status = #{status}
+          and approval_content != null
+        order by create_time desc
+            LIMIT 1
+    </select>
+
+
+
 
 
 </mapper>