Commit fdc556a6 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-合同审核,去除自动化电子签

parent 0d06bc0f
...@@ -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
......
...@@ -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) {
......
...@@ -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";
......
...@@ -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