소스 검색

政策-操作记录

yangzian 3 년 전
부모
커밋
b8d9d4fd12

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

@@ -256,7 +256,8 @@ public class CwjsPolicyInfoController {
 
 			 //老板
 			 if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
-				 cwjsPolicyInfo.setApprovedStatus(3);
+				 cwjsPolicyInfo.setApprovedStatus(0);
+				 cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
 
 				 /**
 				  * 终审通过后 添加 起始时间
@@ -288,14 +289,7 @@ public class CwjsPolicyInfoController {
 			cwjsPolicyInfo.setApprovedStatus(4);
 
 			CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
-			//老板
-			if (approvalUser.equals(userId) && userId.equals("80e747cdea6f41dbbc8cde23046fd4e0")){
-				policyApprovalLog.setApprovalStatus(3);
-
-			}else {
-				policyApprovalLog.setApprovalStatus(1);
-			}
-
+			policyApprovalLog.setApprovalStatus(1);
 			policyApprovalLog.setPolicyId(id);
 			policyApprovalLog.setCreateUserId(userId);
 			policyApprovalLog.setApprovalContent(Check.isNull(approvalContent) ? "审核拒绝" : approvalContent);
@@ -397,7 +391,7 @@ public class CwjsPolicyInfoController {
 			CwjsPolicyApprovalLog forwardContent = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(),2);	// 查询 转发领导的理由 最新的一条
 			cwjsPolicy.setTheForwardingBossContent(Check.isNull(forwardContent) ? "" : forwardContent.getApprovalContent());
 
-			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId(),3);	// 查询 老板审核意见 最新的一条
+			CwjsPolicyApprovalLog bossContent = policyApprovalLogMapper.getBossOneByPolicyId(cwjsPolicy.getId());	// 查询 老板审核意见 最新的一条
 			cwjsPolicy.setTheBossContent(Check.isNull(bossContent) ? "" : bossContent.getApprovalContent());
 
 			CwjsPolicyApprovalLog legalContent = policyApprovalLogMapper.getOneByPolicyLegalInfo(cwjsPolicy.getId());	// 查询 法务 审核意见 最新的一条

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

@@ -35,5 +35,5 @@ public interface CwjsPolicyApprovalLogMapper extends BaseMapper<CwjsPolicyApprov
      * @param policyId
      * @return
      */
-    CwjsPolicyApprovalLog getBossOneByPolicyId(@Param("policyId") Integer policyId,@Param("status") Integer status);
+    CwjsPolicyApprovalLog getBossOneByPolicyId(@Param("policyId") Integer policyId);
 }

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

@@ -36,8 +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 approval_status = #{status}
-          and approval_content is NOT NULL
+          and create_user_id = '80e747cdea6f41dbbc8cde23046fd4e0'
         order by create_time desc
             LIMIT 1
     </select>