yangzian 3 年 前
コミット
92ec923e9d

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

@@ -386,17 +386,20 @@ public class CwjsPolicyInfoController {
 
 				//政策当前审核人 = 最后一个审核人 = 当前用户   && 状态不为3 审核通过  && 状态不为4 审核拒绝  ||  当前用户 不是老板
 				// 则显示 转领导审批
+				cwjsPolicy.setTheBossRight("no");
 				if(cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4){
 					if (StringUtils.equals(cwjsPolicy.getApprovedProgress(),directorUserId) && directorUserId.equals(userId)
 							&& !"80e747cdea6f41dbbc8cde23046fd4e0".equals(userId)){
-						cwjsPolicy.setTheBossRight("yes");
+
+						//查询 是否符合自动转审条件
+						List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicy.getAccountingPeriod(),cwjsPolicy.getMediaType(),
+								cwjsPolicy.getAdvancePay(),cwjsPolicy.getRebateType(),cwjsPolicy.getRebateRate());
+						if (!Check.isNull(autoConveryList)){
+							cwjsPolicy.setTheBossRight("yes");
+						}
 					}
-				}else {
-					cwjsPolicy.setTheBossRight("no");
 				}
 
-
-
 			StringBuilder stringBuilder = new StringBuilder();
 
 			//审核拒绝

+ 47 - 40
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -327,48 +327,55 @@
     <!-- 查询 政策审核记录 -->
     <select id="getPolicyApprovalLogByPolicyId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-            l.id,
-            l.policy_id policyId,
-            l.approval_status approvalStatus,
-            l.approval_content approvalContent,
-            l.create_user_id userId,
-            u.realname userName,
-            l.create_time createTime,
-            r.role_name roleName
-        FROM
-            `jeecg-boot`.`ctop_cwjs_policy_approval_log` l
-            LEFT JOIN `jeecg-boot`.sys_user u ON l.create_user_id = u.id
-            LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
-            LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
-        WHERE
-            l.policy_id = #{policyId}
-        UNION
-        SELECT
-            p.id,
-            p.id policyId,
-            '0' approvalStatus,
-            CASE
-            p.approved_status
-            WHEN 0 THEN '待审核'
-            WHEN 1 THEN '审核中'
-            WHEN 2 THEN '审核通过/拒绝'
-            WHEN 3 THEN '审核完成'
-            WHEN 4 THEN '待提交' ELSE '-'
-            END AS approvalContent,
-            IF
-            ( p.approved_progress = 'legalAffairs', 'legalAffairs', p.approved_progress ) userId,
+            t.*,
+            IFNULL( IF ( t.userid = 'legalAffairs', '法务人员', u.realname ), t.create_user_name ) userName,
             IF
-            ( p.approved_progress = 'legalAffairs', '法务人员', u.realname ) userName,
-            NOW() createTime,
-            r.role_name roleName
+                ( t.userId = 'legalAffairs', '法务', r.role_name ) roleName
         FROM
-            ctop_cwjs_policy_info p
-            LEFT JOIN `jeecg-boot`.sys_user u ON p.approved_progress = u.id
-            LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
-            LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
-        WHERE
-        p.id = #{policyId}
-        ORDER BY id
+            (
+                SELECT
+                    l.id,
+                    l.policy_id policyId,
+                    l.approval_status approvalStatus,
+                    l.approval_content approvalContent,
+                    l.create_user_id userId,
+                    p.create_user_name,
+                    l.create_time createTime
+                FROM
+                    `jeecg-boot`.`ctop_cwjs_policy_approval_log` l
+                        LEFT JOIN `jeecg-boot`.ctop_cwjs_policy_info p ON l.policy_id = p.id
+                WHERE
+                    l.policy_id = #{policyId}
+                UNION
+                SELECT
+                    p.id,
+                    p.id policyId,
+                    '0' approvalStatus,
+                    CASE
+                        p.approved_status
+                        WHEN 1 THEN
+                            '待审核'
+                        WHEN 2 THEN
+                            '待审核'
+                        WHEN 3 THEN
+                            '审核完成'
+                        WHEN 4 THEN
+                            '待提交' ELSE '-'
+                        END AS approvalContent,
+                    IFNULL( IF ( p.approved_progress = 'legalAffairs', 'legalAffairs', p.approved_progress ), p.create_user_id ) userId,
+                    p.create_user_name,
+                    NOW() createTime
+                FROM
+                    ctop_cwjs_policy_info p
+                WHERE
+                    p.id = #{policyId}
+            ) t
+                LEFT JOIN `jeecg-boot`.sys_user u ON t.userid = u.id
+                LEFT JOIN `jeecg-boot`.sys_user_role ur ON ur.user_id = u.id
+                LEFT JOIN `jeecg-boot`.sys_role r ON r.id = ur.role_id
+        ORDER BY
+            id
+
     </select>