yangzian 3 роки тому
батько
коміт
716238320b

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

@@ -365,8 +365,8 @@ public class CwjsPolicyInfoController {
 			//法务
 		}else if("legalAffairs".equalsIgnoreCase(roleCode)){
 			//法务 查看
-			cwjsPolicyInfo.setAdvancePay(0); //预付 -否
-			cwjsPolicyInfo.setCustomerFlag(0);// 老客户 -否
+			//cwjsPolicyInfo.setAdvancePay(0); //预付 -否
+			//cwjsPolicyInfo.setCustomerFlag(0);// 老客户 -否
 
 		}else {
 			//查询 对应的销售或 助理

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

@@ -55,7 +55,7 @@
         and ((#{policyStartDate} <= t2.policy_start_date and #{policyEndDate} >= t2.policy_start_date)
         or (#{policyStartDate} >= t2.policy_start_date and #{policyStartDate} <= t2.policy_end_date))
         </if>
-        order by t2.create_time desc
+        order by t2.create_time DESC,p.id DESC
     </select>
 
     <select id="getAllSale" resultType="com.alibaba.fastjson.JSONObject">

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -187,7 +187,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
         corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
         CwjsPolicyApprovalLog policyApprovalLog = new CwjsPolicyApprovalLog();
         policyApprovalLog.setPolicyId(cwjsPolicyInfo.getId());
-        policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
+        policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getApprovedProgress());
         policyApprovalLog.setApprovalStatus(2);//0-审核通过  1-审核不通过 2-转给领导
         policyApprovalLog.setApprovalContent("转审领导。");
         policyApprovalLog.setCreateTime(new Date());