Commit 484a1ffa authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents 9e845f8e 5b501c2c
...@@ -362,9 +362,9 @@ public class InsurancesConstants { ...@@ -362,9 +362,9 @@ public class InsurancesConstants {
*/ */
public static final String POLICY_NO_EXIST = "保单号不存在或已过期"; public static final String POLICY_NO_EXIST = "保单号不存在或已过期";
/** /**
* 保单号不存 * 保单号不存
*/ */
public static final String POLICY_NO_NOT_EXIST = "保单号不存"; public static final String POLICY_NO_NOT_EXIST = "保单号不存";
/** /**
* 保单号信息错误 * 保单号信息错误
*/ */
......
...@@ -168,6 +168,15 @@ public class ValidityUtil { ...@@ -168,6 +168,15 @@ public class ValidityUtil {
if(!money.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){ if(!money.matches(ValidityConstants.POSITIVE_INTEGER_PATTERN_TWO_FLOAT)){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
BigDecimal bigDecimalMoney= new BigDecimal(money);
boolean max = bigDecimalMoney.compareTo(CommonConstants.MONEY_MAX) >0;
if(max){
return Boolean.FALSE ;
}
boolean min = bigDecimalMoney.compareTo(CommonConstants.MONEY_MIN) <=0;
if(min){
return Boolean.FALSE ;
}
return Boolean.TRUE; return Boolean.TRUE;
} }
......
...@@ -140,7 +140,7 @@ public class TForecastLibrary extends BaseEntity { ...@@ -140,7 +140,7 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty("单位生育费用") @ExcelProperty("单位生育费用")
private BigDecimal unitBirthFee; private BigDecimal unitBirthFee;
/** /**
* 单位医疗救助金 * 单位医疗救助金-单位大病金额
*/ */
@ExcelAttribute(name = "单位医疗救助金") @ExcelAttribute(name = "单位医疗救助金")
@ExcelProperty("单位医疗救助金") @ExcelProperty("单位医疗救助金")
...@@ -164,7 +164,7 @@ public class TForecastLibrary extends BaseEntity { ...@@ -164,7 +164,7 @@ public class TForecastLibrary extends BaseEntity {
@ExcelProperty("个人失业费用") @ExcelProperty("个人失业费用")
private BigDecimal personalUnemploymentFee; private BigDecimal personalUnemploymentFee;
/** /**
* 个人医疗救助金 * 个人医疗救助金-个人大病金额
*/ */
@ExcelAttribute(name = "个人医疗救助金") @ExcelAttribute(name = "个人医疗救助金")
@ExcelProperty("个人医疗救助金") @ExcelProperty("个人医疗救助金")
......
...@@ -68,9 +68,8 @@ public class TForecastLibraryController { ...@@ -68,9 +68,8 @@ public class TForecastLibraryController {
* @param id id * @param id id
* @return R * @return R
*/ */
@Operation(summary = "通过id查询", description = "通过id查询:hasPermission('social_tforecastlibrary_get')") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}") @GetMapping("/{id}")
@PreAuthorize("@pms.hasPermission('social_tforecastlibrary_get')")
public R<TForecastLibrary> getById(@PathVariable("id") String id) { public R<TForecastLibrary> getById(@PathVariable("id") String id) {
return R.ok(tForecastLibraryService.getById(id)); return R.ok(tForecastLibraryService.getById(id));
} }
......
...@@ -217,6 +217,12 @@ ...@@ -217,6 +217,12 @@
</sql> </sql>
<sql id="tDispatchInfo_where"> <sql id="tDispatchInfo_where">
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.idList != null">
AND a.ID in
<foreach item="idStr" index="index" collection="tDispatchInfo.idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
<if test="tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''"> <if test="tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''">
AND a.ID = #{tDispatchInfo.id} AND a.ID = #{tDispatchInfo.id}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment