yumeng 1 vuosi sitten
vanhempi
commit
0d43457016

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

@@ -500,6 +500,9 @@ public class CwjsPolicyInfoController {
             cwjsPolicy.setLegalAffairsContent(Check.isNull(legalContent) ? "" : legalContent.getApprovalContent());
 
 
+            CwjsPolicyApprovalLog mediaContent = policyApprovalLogMapper.getOneByPolicyMeidaInfo(cwjsPolicy.getId());    // 查询 政策审核角色 审核意见 最新的一条
+            cwjsPolicy.setMeidiaAffairsContent(Check.isNull(mediaContent) ? "" : legalContent.getApprovalContent());
+
             JSONObject examineUser = new JSONObject();
             String directorUserId = "";
 

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/entity/CwjsPolicyInfo.java

@@ -192,6 +192,8 @@ public class CwjsPolicyInfo implements Serializable{
 	@TableField(exist = false)
 	private String legalAffairsContent;
 
+	@TableField(exist = false)
+	private String meidiaAffairsContent;
 
 	@TableField(exist = false)
 	private String loginUserId;

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

@@ -36,4 +36,6 @@ public interface CwjsPolicyApprovalLogMapper extends BaseMapper<CwjsPolicyApprov
      * @return
      */
     CwjsPolicyApprovalLog getBossOneByPolicyId(@Param("policyId") Integer policyId);
+
+    CwjsPolicyApprovalLog getOneByPolicyMeidaInfo(@Param("policyId") Integer policyId);
 }

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

@@ -40,9 +40,22 @@
         order by create_time desc
             LIMIT 1
     </select>
+    <select id="getOneByPolicyMeidaInfo" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog">
 
-
-
+         SELECT
+            l.*
+        FROM
+            ctop_cwjs_policy_approval_log l
+                LEFT JOIN sys_user_role ur ON l.create_user_id = ur.user_id
+                LEFT JOIN sys_role r ON r.id = ur.role_id
+        WHERE
+            r.role_name = '政策审核'
+          AND l.policy_id = #{policyId}
+          and l.approval_content is NOT NULL
+        ORDER BY
+            l.create_time DESC
+            LIMIT 1
+    </select>
 
 
 </mapper>

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

@@ -22,8 +22,6 @@
         <if test="rebateType != null">and t2.rebate_type = #{rebateType}</if>
         <if test="advancePay != null">and t2.advance_pay = #{advancePay}</if>
         <if test="customerFlag != null">and t2.customer_flag = #{customerFlag}</if>
-
-
         <if test="saleIds != null and saleIds.size() > 0">
             and  (t2.sale_id in
             <foreach item="item" index="index" collection="saleIds" open="(" separator="," close=")">