Commit b81311e1 authored by fangxinjiang's avatar fangxinjiang

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

parents 81d19eaa 86926cce
......@@ -108,7 +108,7 @@ public class TEmployeeContractInfoController {
public R<IPage<TEmployeeContractInfo>> getAuditPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo) {
tEmployeeContractInfo.setAuditStatus(CommonConstants.ONE_INT);
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
*/
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page
, @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<EmployeeContractExportVO> getTEmployeeContractExport(@Param("tEmployeeContractInfo") TEmployeeContractInfo tEmployeeContractInfo);
......
......@@ -46,6 +46,9 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
*/
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo);
// 审核列表
IPage<TEmployeeContractInfo> getTEmployeeContractInfoPageByAudit(Page<TEmployeeContractInfo> page, TEmployeeContractInfo tEmployeeContractInfo);
/**
* @param tEmployeeContractInfo
* @Description: list
......
......@@ -126,6 +126,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public IPage<TEmployeeContractInfo> getTEmployeeContractInfoPage(Page<TEmployeeContractInfo> page, TEmployeeContractInfo 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
public List<TEmployeeContractInfo> getTEmployeeContractList(TEmployeeContractInfo tEmployeeContractInfo) {
......@@ -552,9 +562,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre.setErrorInfo("");
contractPre.setErrorTime(null);
contractPreMapper.updateById(contractPre);
if ("0".equals(contractPre.getSignType())) {
tEmployeeContractInfo.setAuditStatus(CommonConstants.FOUR_INT);
}
}
}
// 瓜子项目编码:皖A694302
......
......@@ -388,8 +388,6 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List<EmployeeContractVO> singleContractList = new ArrayList<>();
singleContractList.add(contractVO);
List<ErrorMessage> singleErrorMessageList = new ArrayList<>();
singleContractList.add(contractVO);
// 调用合同导入方法
contractInfoService.importContract(singleContractList, singleErrorMessageList);
......
......@@ -55,7 +55,7 @@ public class FascUtil {
@Autowired
private RedisTemplate redisTemplate;
@Autowired
//@Autowired
//private FascConfig fascConfig;
private static final String DATA_COVER = "dataCover";
......
......@@ -445,6 +445,20 @@
</where>
order by a.APPLY_NO desc
</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-->
<select id="getTEmployeeContractList" resultMap="tEmployeeContrctInfoMap">
......@@ -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
<where>
a.DELETE_FLAG = 0
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}
......@@ -694,7 +708,7 @@
count(1)
FROM t_employee_contract_info a
<where>
a.DELETE_FLAG = 0
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}
......
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