diff --git a/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java b/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java index fb2bb79ece5e7c120949277056f16f71cb056bcc..390a84d5b056fbbf2129478a0580cdc7651d72d1 100644 --- a/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java +++ b/yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java @@ -112,6 +112,10 @@ public class InsurancesConstants { * 未找到符åˆæ¡ä»¶çš„å‚ä¿è®°å½• */ public static final String NOT_FOUND_INSURANCE_RECORD = "未找到符åˆæ¡ä»¶çš„å‚ä¿è®°å½•"; + /** + * 未找到符åˆæ¡ä»¶çš„新增或批增投ä¿æ•°æ® + */ + public static final String NOT_FOUND_INSERT_OR_BATCH_RECORD = "未找到符åˆæ¡ä»¶çš„新增或批增投ä¿æ•°æ®"; /** * 当å‰æŠ•ä¿çŠ¶æ€æ— 法å˜æ›´æŠ•ä¿è®°å½• */ diff --git a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java index 6c930157640e9bf562be15b20c50e61a8ec7eb46..d1b7f4867c77df9a5630d63c59edbff5e8c21ecc 100644 --- a/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java +++ b/yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java @@ -3418,7 +3418,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap .last(CommonConstants.LAST_ONE_SQL) ); if (!Optional.ofNullable(detail).isPresent()){ - param.setErrorMessage(InsurancesConstants.DATA_IS_NOT_EXIST); + param.setErrorMessage(InsurancesConstants.NOT_FOUND_INSERT_OR_BATCH_RECORD); continue; }else { LambdaQueryWrapper<TInsuranceEkp> ekpLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -3636,7 +3636,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap .last(CommonConstants.LAST_ONE_SQL) ); if (!Optional.ofNullable(detail).isPresent()){ - param.setErrorMessage(InsurancesConstants.NOT_FOUND_INSURANCE_RECORD); + param.setErrorMessage(InsurancesConstants.NOT_FOUND_INSERT_OR_BATCH_RECORD); continue; }else { if (detail.getBuyHandleStatus() != CommonConstants.THREE_INT && detail.getBuyHandleStatus() != CommonConstants.FIVE_INT){ diff --git a/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePolicyMapper.xml b/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePolicyMapper.xml index 7cbd936723c4c9929f75be33bf5bb7791a02de7a..8a170ade48eddf351eca92b0bc41fe0db3521d25 100644 --- a/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePolicyMapper.xml +++ b/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsurancePolicyMapper.xml @@ -36,10 +36,10 @@ and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%') </if> <if test="param.policyStart != null and param.policyStart.trim() != ''"> - AND POLICY_START <![CDATA[ >= ]]> concat(#{param.policyStart},'') + AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} </if> <if test="param.policyEnd != null and param.policyEnd.trim() != ''"> - AND POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd},'') + AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd} </if> <if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"> and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%') @@ -62,10 +62,10 @@ and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%') </if> <if test="param.policyStart != null and param.policyStart.trim() != ''"> - AND POLICY_START <![CDATA[ >= ]]> concat(#{param.policyStart},'') + AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} </if> <if test="param.policyEnd != null and param.policyEnd.trim() != ''"> - AND POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd},'') + AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd} </if> <if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''"> and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')