Commit c7f8e1dc authored by fangxinjiang's avatar fangxinjiang

节假日配置表及社保医疗截止配置表

parent ece0debc
...@@ -48,7 +48,7 @@ public class FailReasonConfig extends BaseEntity { ...@@ -48,7 +48,7 @@ public class FailReasonConfig extends BaseEntity {
@Length(max = 20, message = "关键字不能超过20个字符") @Length(max = 20, message = "关键字不能超过20个字符")
@ExcelProperty("关键字") @ExcelProperty("关键字")
@Schema(description = "关键字") @Schema(description = "关键字")
private String key; private String keys;
/** /**
* 精简原因 * 精简原因
*/ */
......
...@@ -43,7 +43,7 @@ public class FailReasonConfigServiceImpl extends ServiceImpl<FailReasonConfigMap ...@@ -43,7 +43,7 @@ public class FailReasonConfigServiceImpl extends ServiceImpl<FailReasonConfigMap
Map<String, FailReasonConfig> map = new HashMap<>(); Map<String, FailReasonConfig> map = new HashMap<>();
List<FailReasonConfig> list = baseMapper.getFailReasonConfigList(); List<FailReasonConfig> list = baseMapper.getFailReasonConfigList();
for (FailReasonConfig config : list) { for (FailReasonConfig config : list) {
map.put(config.getKey(), config); map.put(config.getKeys(), config);
} }
return map; return map;
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<resultMap id="failReasonConfigMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig"> <resultMap id="failReasonConfigMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig">
<id property="id" column="ID"/> <id property="id" column="ID"/>
<result property="reason" column="REASON"/> <result property="reason" column="REASON"/>
<result property="key" column="KEY"/> <result property="keys" column="KEYS"/>
<result property="simpleReason" column="SIMPLE_REASON"/> <result property="simpleReason" column="SIMPLE_REASON"/>
<result property="replay" column="REPLAY"/> <result property="replay" column="REPLAY"/>
<result property="status" column="STATUS"/> <result property="status" column="STATUS"/>
...@@ -17,12 +17,13 @@ ...@@ -17,12 +17,13 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
a.REASON, a.REASON,
a.KEY, a.`KEYS`,
a.SIMPLE_REASON, a.SIMPLE_REASON,
a.REPLAY, a.REPLAY,
a.STATUS, a.`STATUS`,
a.CREATE_TIME, a.CREATE_TIME,
a.CREATE_NAME, a.CREATE_NAME,
a.CREATE_BY,
a.UPDATE_TIME, a.UPDATE_TIME,
a.UPDATE_BY a.UPDATE_BY
</sql> </sql>
...@@ -31,8 +32,8 @@ ...@@ -31,8 +32,8 @@
<if test="failReasonConfig.reason != null and failReasonConfig.reason.trim() != ''"> <if test="failReasonConfig.reason != null and failReasonConfig.reason.trim() != ''">
AND a.REASON LIKE concat('%',#{failReasonConfig.reason},'%') AND a.REASON LIKE concat('%',#{failReasonConfig.reason},'%')
</if> </if>
<if test="failReasonConfig.key != null and failReasonConfig.key.trim() != ''"> <if test="failReasonConfig.keys != null and failReasonConfig.keys.trim() != ''">
AND a.KEY = #{failReasonConfig.key} AND a.KEYS = #{failReasonConfig.keys}
</if> </if>
<if test="failReasonConfig.simpleReason != null and failReasonConfig.simpleReason.trim() != ''"> <if test="failReasonConfig.simpleReason != null and failReasonConfig.simpleReason.trim() != ''">
AND a.SIMPLE_REASON = #{failReasonConfig.simpleReason} AND a.SIMPLE_REASON = #{failReasonConfig.simpleReason}
......
...@@ -968,7 +968,9 @@ ...@@ -968,7 +968,9 @@
a.MAJOR, a.MAJOR,
a.FIRST_PAY_TIME, a.FIRST_PAY_TIME,
a.GRADUATION_TIME, a.GRADUATION_TIME,
a.AUTO_FLAG case when a.AUTO_FLAG = 0 then "是"
when a.AUTO_FLAG = 1 then "否"
else "无" end as "AUTO_FLAG"
from t_dispatch_info a from t_dispatch_info a
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
......
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