Эх сурвалжийг харах

承保规则表单验证,费用因子条件修改bug

785834757 2 жил өмнө
parent
commit
81fe42efc7

+ 1 - 2
src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -964,8 +964,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
         //创建时间
         if(agreementProductQueryVo.getCreateStartTime() != null)
         {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.or().gt(PtlAgreementProductCostsNew::getCreateTime, agreementProductQueryVo.getCreateStartTime())
-                    .lt(PtlAgreementProductCostsNew::getCreateTime, agreementProductQueryVo.getCreateEndTime());
+            ptlAgreementProductCostsNewLambdaQueryWrapper.between(PtlAgreementProductCostsNew::getCreateTime,agreementProductQueryVo.getCreateStartTime(),agreementProductQueryVo.getCreateEndTime());
         }
 
         Page<PtlAgreementProductCostsNew> pages = baseMapper.selectPage(page, ptlAgreementProductCostsNewLambdaQueryWrapper);

+ 11 - 0
src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesNewServiceImpl.java

@@ -198,9 +198,20 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
         return "";
     }
 
+    /**
+     * 验证承保规则表单
+     */
+    private void validateRules(AgreementUndwrtRules agreementUndwrtRules){
+        if(agreementUndwrtRules.getValidInd() == null)
+        {
+            throw new RuntimeException("有效标志不能为空");
+        }
+    }
+
     @Transactional
     @Override
     public boolean rulesAdd(AgreementUndwrtRules agreementUndwrtRules) {
+        validateRules(agreementUndwrtRules);
         //添加承保规则主表信息
         PtlAgreementUndwrtRulesNew ptlAgreementUndwrtRulesNew = new PtlAgreementUndwrtRulesNew();
         BeanUtils.copyProperties(agreementUndwrtRules, ptlAgreementUndwrtRulesNew);