Browse Source

添加约束:老客+有账期,不过老板审核

zhaoxian 10 months ago
parent
commit
49a485cd57

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

@@ -305,9 +305,14 @@ public class CwjsPolicyInfoController {
 
 
             //丁兆明 : b161b7d9793942f980dbfe8c931cd1b0,审核通过直接到老板或者结束
             //丁兆明 : b161b7d9793942f980dbfe8c931cd1b0,审核通过直接到老板或者结束
             if (approvalUser.equals(userId) && "b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
             if (approvalUser.equals(userId) && "b161b7d9793942f980dbfe8c931cd1b0".equals(userId)) {
-                //查询 是否符合条件
-                List<JSONObject> autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
-                        cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
+
+                List<JSONObject> autoConveryList = null;
+                //老客+有账期,不过老板审核
+                if (!(cwjsPolicyInfo.getCustomerFlag() == 1 && !Check.isNull(cwjsPolicyInfo.getAccountingPeriod()))) {
+                    //查询 是否符合条件
+                    autoConveryList = cwjsPolicyInfoMapper.selAutoConveryInfo(cwjsPolicyInfo.getAccountingPeriod(), cwjsPolicyInfo.getMediaType(),
+                            cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
+                }
                 if (!Check.isNull(autoConveryList)) {
                 if (!Check.isNull(autoConveryList)) {
                     //符合条件,自动转老板
                     //符合条件,自动转老板
                     cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
                     cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);