Commit c2e897ef authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents d0d21995 469a0443
...@@ -196,4 +196,112 @@ public class TAutoSocialRuleRel extends BaseEntity { ...@@ -196,4 +196,112 @@ public class TAutoSocialRuleRel extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("基数下限(社保或公积金)") @ExcelProperty("基数下限(社保或公积金)")
private BigDecimal lowerLimit; private BigDecimal lowerLimit;
/**
* 养老基数上限
*/
@ExcelAttribute(name = "养老基数上限")
@Schema(description = "养老基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数上限")
private BigDecimal upPersion;
/**
* 医疗基数上限
*/
@ExcelAttribute(name = "医疗基数上限")
@Schema(description = "医疗基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数上限")
private BigDecimal upMedical;
/**
* 失业基数上限
*/
@ExcelAttribute(name = "失业基数上限")
@Schema(description = "失业基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数上限")
private BigDecimal upUnemployment;
/**
* 工伤基数上限
*/
@ExcelAttribute(name = "工伤基数上限")
@Schema(description = "工伤基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数上限")
private BigDecimal upInjury;
/**
* 生育基数上限
*/
@ExcelAttribute(name = "生育基数上限")
@Schema(description = "生育基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数上限")
private BigDecimal upBirth;
/**
* 大病基数上限
*/
@ExcelAttribute(name = "大病基数上限")
@Schema(description = "大病基数上限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数上限")
private BigDecimal upBig;
/**
* 养老基数下限
*/
@ExcelAttribute(name = "养老基数下限")
@Schema(description = "养老基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老基数下限")
private BigDecimal lowerPersion;
/**
* 医疗基数下限
*/
@ExcelAttribute(name = "医疗基数下限")
@Schema(description = "医疗基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医疗基数下限")
private BigDecimal lowerMedical;
/**
* 失业基数下限
*/
@ExcelAttribute(name = "失业基数下限")
@Schema(description = "失业基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("失业基数下限")
private BigDecimal lowerUnemployment;
/**
* 工伤基数下限
*/
@ExcelAttribute(name = "工伤基数下限")
@Schema(description = "工伤基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("工伤基数下限")
private BigDecimal lowerInjury;
/**
* 生育基数下限
*/
@ExcelAttribute(name = "生育基数下限")
@Schema(description = "生育基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("生育基数下限")
private BigDecimal lowerBirth;
/**
* 大病基数下限
*/
@ExcelAttribute(name = "大病基数下限")
@Schema(description = "大病基数下限")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("大病基数下限")
private BigDecimal lowerBig;
} }
...@@ -108,7 +108,7 @@ public class TEmployeeContractInfoController { ...@@ -108,7 +108,7 @@ public class TEmployeeContractInfoController {
public R<IPage<TEmployeeContractInfo>> getAuditPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) { public R<IPage<TEmployeeContractInfo>> getAuditPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
tEmployeeContractInfo.setAuditStatus(CommonConstants.ONE_INT); tEmployeeContractInfo.setAuditStatus(CommonConstants.ONE_INT);
this.setAuth(tEmployeeContractInfo); this.setAuth(tEmployeeContractInfo);
return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPage(page, tEmployeeContractInfo)); return new R<>(tEmployeeContractInfoService.getTEmployeeContractInfoPageByAudit(page, tEmployeeContractInfo));
} }
/** /**
......
...@@ -44,6 +44,14 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac ...@@ -44,6 +44,14 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
*/ */
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page
, @Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo); , @Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo);
/**
* 审核列表
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPageByAudit(Page<TEmployeeContractInfo> page
, @Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo);
List<TEmployeeContractInfo> getTEmployeeContractList(@Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo); List<TEmployeeContractInfo> getTEmployeeContractList(@Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo);
List<EmployeeContractExportVO> getTEmployeeContractExport(@Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo); List<EmployeeContractExportVO> getTEmployeeContractExport(@Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo);
......
...@@ -46,6 +46,9 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract ...@@ -46,6 +46,9 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
*/ */
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo); IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo);
// 审核列表
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPageByAudit(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo);
/** /**
* @param tEmployeeContractInfo * @param tEmployeeContractInfo
* @Description: list * @Description: list
......
...@@ -902,6 +902,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu ...@@ -902,6 +902,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
ignoreFields.add("upperLimit"); ignoreFields.add("upperLimit");
ignoreFields.add("lowerLimit"); ignoreFields.add("lowerLimit");
ignoreFields.add("upPersion");
ignoreFields.add("upMedical");
ignoreFields.add("upUnemployment");
ignoreFields.add("upInjury");
ignoreFields.add("upBirth");
ignoreFields.add("upBig");
ignoreFields.add("lowerPersion");
ignoreFields.add("lowerMedical");
ignoreFields.add("lowerUnemployment");
ignoreFields.add("lowerInjury");
ignoreFields.add("lowerBirth");
ignoreFields.add("lowerBig");
// 更新档案管理规则 // 更新档案管理规则
if (Common.isNotNull(autoEmpRuleNew)){ if (Common.isNotNull(autoEmpRuleNew)){
String differenceKey = HrEquator.comparisonValueIgnoreField(autoEmpRuleOld, autoEmpRuleNew,ignoreFields); String differenceKey = HrEquator.comparisonValueIgnoreField(autoEmpRuleOld, autoEmpRuleNew,ignoreFields);
......
...@@ -126,6 +126,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -126,6 +126,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) { public IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
return baseMapper.getTEmployeeContractInfoPage(page, tEmployeeContractInfo); return baseMapper.getTEmployeeContractInfoPage(page, tEmployeeContractInfo);
} }
/**
* 审核列表
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
@Override
public IPage<TEmployeeContractInfo> getTEmployeeContractInfoPageByAudit(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
return baseMapper.getTEmployeeContractInfoPageByAudit(page, tEmployeeContractInfo);
}
@Override @Override
public List<TEmployeeContractInfo> getTEmployeeContractList(TEmployeeContractInfo tEmployeeContractInfo) { public List<TEmployeeContractInfo> getTEmployeeContractList(TEmployeeContractInfo tEmployeeContractInfo) {
......
...@@ -131,8 +131,8 @@ public class DoFascTask { ...@@ -131,8 +131,8 @@ public class DoFascTask {
pre.setRevokeReason(terminationNote); pre.setRevokeReason(terminationNote);
tEmployeeContractPreService.updateById(pre); tEmployeeContractPreService.updateById(pre);
} }
//如果存在合同申请审核数据,将状态更新成待提交 //如果存在合同申请审核数据,将状态更新成5撤销签署
contractInfo.setAuditStatus(CommonConstants.ZERO_INT); contractInfo.setAuditStatus(CommonConstants.FIVE_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING); contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo); tEmployeeContractInfoService.updateById(contractInfo);
} else if (fddEvent.equals("sign-task-sign-failed") } else if (fddEvent.equals("sign-task-sign-failed")
...@@ -144,8 +144,8 @@ public class DoFascTask { ...@@ -144,8 +144,8 @@ public class DoFascTask {
pre.setRequestId(""); pre.setRequestId("");
tEmployeeContractPreService.updateById(pre); tEmployeeContractPreService.updateById(pre);
//如果存在合同申请审核数据,将状态更新成待提交 //如果存在合同申请审核数据,将状态更新成6签署失败
contractInfo.setAuditStatus(CommonConstants.ZERO_INT); contractInfo.setAuditStatus(CommonConstants.SIX_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING); contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo); tEmployeeContractInfoService.updateById(contractInfo);
......
...@@ -55,7 +55,7 @@ public class FascUtil { ...@@ -55,7 +55,7 @@ public class FascUtil {
@Autowired @Autowired
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
@Autowired //@Autowired
//private FascConfig fascConfig; //private FascConfig fascConfig;
private static final String DATA_COVER = "dataCover"; private static final String DATA_COVER = "dataCover";
......
...@@ -47,6 +47,18 @@ ...@@ -47,6 +47,18 @@
<result property="province" column="PROVINCE"/> <result property="province" column="PROVINCE"/>
<result property="city" column="CITY"/> <result property="city" column="CITY"/>
<result property="town" column="TOWN"/> <result property="town" column="TOWN"/>
<result property="upPersion" column="UP_PERSION"/>
<result property="upMedical" column="UP_MEDICAL"/>
<result property="upUnemployment" column="UP_UNEMPLOYMENT"/>
<result property="upInjury" column="UP_INJURY"/>
<result property="upBirth" column="UP_BIRTH"/>
<result property="upBig" column="UP_BIG"/>
<result property="lowerPersion" column="LOWER_PERSION"/>
<result property="lowerMedical" column="LOWER_MEDICAL"/>
<result property="lowerUnemployment" column="LOWER_UNEMPLOYMENT"/>
<result property="lowerInjury" column="LOWER_INJURY"/>
<result property="lowerBirth" column="LOWER_BIRTH"/>
<result property="lowerBig" column="LOWER_BIG"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -72,7 +84,19 @@ ...@@ -72,7 +84,19 @@
a.CITY, a.CITY,
a.TOWN, a.TOWN,
a.UPPER_LIMIT, a.UPPER_LIMIT,
a.LOWER_LIMIT a.LOWER_LIMIT,
a.UP_PERSION,
a.UP_MEDICAL,
a.UP_UNEMPLOYMENT,
a.UP_INJURY,
a.UP_BIRTH,
a.UP_BIG,
a.LOWER_PERSION,
a.LOWER_MEDICAL,
a.LOWER_UNEMPLOYMENT,
a.LOWER_INJURY,
a.LOWER_BIRTH,
a.LOWER_BIG
</sql> </sql>
<sql id="tAutoSocialRuleRel_where"> <sql id="tAutoSocialRuleRel_where">
<if test="tAutoSocialRuleRel != null"> <if test="tAutoSocialRuleRel != null">
......
...@@ -445,6 +445,20 @@ ...@@ -445,6 +445,20 @@
</where> </where>
order by a.APPLY_NO desc order by a.APPLY_NO desc
</select> </select>
<!--审核列表-->
<select id="getTEmployeeContractInfoPageByAudit" resultMap="tEmployeeContrctInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_employee_contract_info a
<where>
a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1')
<include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql}
</if>
</where>
order by a.APPLY_NO desc
</select>
<!--list--> <!--list-->
<select id="getTEmployeeContractList" resultMap="tEmployeeContrctInfoMap"> <select id="getTEmployeeContractList" resultMap="tEmployeeContrctInfoMap">
...@@ -675,7 +689,7 @@ ...@@ -675,7 +689,7 @@
left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1')
<include refid="tEmployeeContractInfo_where"/> <include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"> <if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql} ${tEmployeeContractInfo.authSql}
...@@ -694,7 +708,7 @@ ...@@ -694,7 +708,7 @@
count(1) count(1)
FROM t_employee_contract_info a FROM t_employee_contract_info a
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1')
<include refid="tEmployeeContractInfo_where"/> <include refid="tEmployeeContractInfo_where"/>
<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"> <if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
${tEmployeeContractInfo.authSql} ${tEmployeeContractInfo.authSql}
......
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