Commit 93f2f6ad authored by fangxinjiang's avatar fangxinjiang

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

parents 479688a2 a4fc4a30
...@@ -136,6 +136,8 @@ public class TCompleteMonitorController { ...@@ -136,6 +136,8 @@ public class TCompleteMonitorController {
@PostMapping("/export") @PostMapping("/export")
@PreAuthorize("@pms.hasPermission('archves_tcompletemonitor-export')") @PreAuthorize("@pms.hasPermission('archves_tcompletemonitor-export')")
public void export(HttpServletResponse response, @RequestBody TCompleteMonitorSearchVo searchVo) { public void export(HttpServletResponse response, @RequestBody TCompleteMonitorSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, searchVo);
tCompleteMonitorService.listExport(response,searchVo); tCompleteMonitorService.listExport(response,searchVo);
} }
......
...@@ -119,6 +119,22 @@ public class TSettleDomainController { ...@@ -119,6 +119,22 @@ public class TSettleDomainController {
@Operation(summary = "不分页查询", description = "不分页查询") @Operation(summary = "不分页查询", description = "不分页查询")
@GetMapping("/noPage") @GetMapping("/noPage")
public R<List<TSettleDomain>> getTSettleDomainNoPage(TSettleDomain tSettleDomain) { public R<List<TSettleDomain>> getTSettleDomainNoPage(TSettleDomain tSettleDomain) {
YifuUser user = SecurityUtils.getUser();
long roleId = 1839501715787390978L;
boolean isSsc = false;
List<Long> roleList = user.getClientRoleMap().get(ClientNameConstants.CLIENT_MVP);
for (Long role : roleList) {
if (role == roleId) {
isSsc = true;
break;
}
}
if (!isSsc) {
menuUtil.setAuthSql(user, tSettleDomain);
if (Common.isNotNull(tSettleDomain.getAuthSql()) && tSettleDomain.getAuthSql().contains("or a.dept_id")) {
tSettleDomain.setAuthSql(tSettleDomain.getAuthSql().replace("or a.dept_id", "or a.id "));
}
}
return R.ok(tSettleDomainService.getList(tSettleDomain)); return R.ok(tSettleDomainService.getList(tSettleDomain));
} }
......
...@@ -1945,6 +1945,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1945,6 +1945,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId = tPreEmployeeInfo.getOldId(); empId = tPreEmployeeInfo.getOldId();
emp = tEmployeeInfoService.getById(empId); emp = tEmployeeInfoService.getById(empId);
if (emp != null) { if (emp != null) {
// 检查人员档案的合同社保公积金状态,如果不是初始状态则不更新
Integer oldContractStatus = emp.getContractStatus();
Integer oldSocialStatus = emp.getSocialStatus();
Integer oldFundStatus = emp.getFundStatus();
Integer oldInsuranceStatus = emp.getInsuranceStatus();
// 生成性别年龄等: // 生成性别年龄等:
this.setBaseSexInfo(tPreEmployeeInfo); this.setBaseSexInfo(tPreEmployeeInfo);
if (isSimpleBoo) { if (isSimpleBoo) {
...@@ -1988,6 +1994,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1988,6 +1994,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp.setCreateTime(LocalDateTime.now()); emp.setCreateTime(LocalDateTime.now());
emp.setFileStatus(CommonConstants.ZERO_INT); emp.setFileStatus(CommonConstants.ZERO_INT);
} }
if (Common.isNotNull(oldContractStatus) && oldContractStatus != 0) {
emp.setContractStatus(oldContractStatus);
}
if (Common.isNotNull(oldSocialStatus) && oldSocialStatus != 0) {
emp.setSocialStatus(oldSocialStatus);
}
if (Common.isNotNull(oldFundStatus) && oldFundStatus != 0) {
emp.setFundStatus(oldFundStatus);
}
if (Common.isNotNull(oldInsuranceStatus) && oldInsuranceStatus != 0) {
emp.setInsuranceStatus(oldInsuranceStatus);
}
tEmployeeInfoService.updateById(emp); tEmployeeInfoService.updateById(emp);
} else { } else {
emp = this.saveTEmployeeInfo(user, tPreEmployeeInfo); emp = this.saveTEmployeeInfo(user, tPreEmployeeInfo);
...@@ -1996,6 +2014,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1996,6 +2014,13 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empIdCard = emp.getEmpIdcard(); empIdCard = emp.getEmpIdcard();
project = tEmployeeProjectService.getById(tPreEmployeeProject.getOldId()); project = tEmployeeProjectService.getById(tPreEmployeeProject.getOldId());
if (project != null) { if (project != null) {
// 检查人员档案的合同社保公积金状态,如果不是初始状态则不更新
Integer oldDeptContractStatus = project.getContractStatus();
Integer oldDeptSocialStatus = project.getSocialStatus();
Integer oldDeptFundStatus = project.getFundStatus();
Integer oldDeptInsuranceStatus = project.getInsuranceStatus();
if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) { if (Common.isEmpty(tPreEmployeeProject.getWorkingHours())) {
tPreEmployeeProject.setWorkingHours(""); tPreEmployeeProject.setWorkingHours("");
} }
...@@ -2017,6 +2042,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2017,6 +2042,18 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else if (CommonConstants.ZERO_INT == project.getProjectStatus()) { } else if (CommonConstants.ZERO_INT == project.getProjectStatus()) {
isMustUpdateSalary = true; isMustUpdateSalary = true;
} }
if (Common.isNotNull(oldDeptContractStatus) && oldDeptContractStatus != 0) {
project.setContractStatus(oldDeptContractStatus);
}
if (Common.isNotNull(oldDeptSocialStatus) && oldDeptSocialStatus != 0) {
project.setSocialStatus(oldDeptSocialStatus);
}
if (Common.isNotNull(oldDeptFundStatus) && oldDeptFundStatus != 0) {
project.setFundStatus(oldDeptFundStatus);
}
if (Common.isNotNull(oldDeptInsuranceStatus) && oldDeptInsuranceStatus != 0) {
project.setInsuranceStatus(oldDeptInsuranceStatus);
}
tEmployeeProjectService.updateById(project); tEmployeeProjectService.updateById(project);
} else { } else {
......
...@@ -361,6 +361,11 @@ ...@@ -361,6 +361,11 @@
select 1 from (select a.EMP_IDCARD from t_pre_emp_work_recording a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ew.EMP_IDCARD select 1 from (select a.EMP_IDCARD from t_pre_emp_work_recording a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ew.EMP_IDCARD
) )
<include refid="tPreEmpMain_where"/> <include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
${tPreEmpMain.authSql}
</if>
</if>
</where> </where>
</select> </select>
...@@ -377,6 +382,11 @@ ...@@ -377,6 +382,11 @@
select 1 from (select a.EMP_IDCARD from t_pre_emp_work_recording a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ew.EMP_IDCARD select 1 from (select a.EMP_IDCARD from t_pre_emp_work_recording a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ew.EMP_IDCARD
) )
<include refid="tPreEmpMain_where"/> <include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
${tPreEmpMain.authSql}
</if>
</if>
</where> </where>
ORDER BY a.emp_idcard DESC ORDER BY a.emp_idcard DESC
<if test="tPreEmpMain != null"> <if test="tPreEmpMain != null">
...@@ -398,6 +408,11 @@ ...@@ -398,6 +408,11 @@
select 1 from (select a.EMP_IDCARD from t_pre_emp_family a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ef.EMP_IDCARD select 1 from (select a.EMP_IDCARD from t_pre_emp_family a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ef.EMP_IDCARD
) )
<include refid="tPreEmpMain_where"/> <include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
${tPreEmpMain.authSql}
</if>
</if>
</where> </where>
</select> </select>
<!--导出统计list2主要家庭成员信息--> <!--导出统计list2主要家庭成员信息-->
...@@ -413,6 +428,11 @@ ...@@ -413,6 +428,11 @@
select 1 from (select a.EMP_IDCARD from t_pre_emp_family a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ef.EMP_IDCARD select 1 from (select a.EMP_IDCARD from t_pre_emp_family a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ef.EMP_IDCARD
) )
<include refid="tPreEmpMain_where"/> <include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
${tPreEmpMain.authSql}
</if>
</if>
</where> </where>
ORDER BY a.emp_idcard DESC ORDER BY a.emp_idcard DESC
<if test="tPreEmpMain != null"> <if test="tPreEmpMain != null">
...@@ -434,6 +454,11 @@ ...@@ -434,6 +454,11 @@
select 1 from (select a.EMP_IDCARD from t_pre_emp_professional_qualification a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ep.EMP_IDCARD select 1 from (select a.EMP_IDCARD from t_pre_emp_professional_qualification a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ep.EMP_IDCARD
) )
<include refid="tPreEmpMain_where"/> <include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
${tPreEmpMain.authSql}
</if>
</if>
</where> </where>
</select> </select>
<!--导出统计list3职业资格信息--> <!--导出统计list3职业资格信息-->
...@@ -449,6 +474,11 @@ ...@@ -449,6 +474,11 @@
select 1 from (select a.EMP_IDCARD from t_pre_emp_professional_qualification a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ep.EMP_IDCARD select 1 from (select a.EMP_IDCARD from t_pre_emp_professional_qualification a left join t_pre_emp_main p on a.PRE_MAIN_ID=p.id where p.STATUS != '5' and p.id is not null GROUP BY a.EMP_IDCARD HAVING count(1)>1) ea where ea.EMP_IDCARD=ep.EMP_IDCARD
) )
<include refid="tPreEmpMain_where"/> <include refid="tPreEmpMain_where"/>
<if test="tPreEmpMain != null">
<if test="tPreEmpMain.authSql != null and tPreEmpMain.authSql.trim() != ''">
${tPreEmpMain.authSql}
</if>
</if>
</where> </where>
ORDER BY a.emp_idcard DESC ORDER BY a.emp_idcard DESC
<if test="tPreEmpMain != null"> <if test="tPreEmpMain != null">
......
...@@ -1399,9 +1399,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1399,9 +1399,14 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
oldDetailList = ekpBankGrantDetailService.getListByParentId(vo.getFdId()); oldDetailList = ekpBankGrantDetailService.getListByParentId(vo.getFdId());
oldMap = new HashMap<>(); oldMap = new HashMap<>();
if (oldDetailList != null && !oldDetailList.isEmpty()) { if (oldDetailList != null && !oldDetailList.isEmpty()) {
String fdId;
for (EkpBankGrantDetail temp : oldDetailList) { for (EkpBankGrantDetail temp : oldDetailList) {
// oldMap.put temp.getFdSerialNumber(), temp) // oldMap.put temp.getFdSerialNumber(), temp)
oldMap.put(temp.getFdSerialNumber(), temp); fdId = temp.getFdId();
if (Common.isNotNull(fdId) && fdId.length()>35) {
fdId = fdId.substring(0, 35);
}
oldMap.put(fdId, temp);
} }
} }
moneyAll = BigDecimal.ZERO; moneyAll = BigDecimal.ZERO;
...@@ -1424,7 +1429,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1424,7 +1429,8 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
logDetail = new EkpBankGrantLogDetail(); logDetail = new EkpBankGrantLogDetail();
setLogDetailBaseInfoNoTax(logs, money, logDetail, data); setLogDetailBaseInfoNoTax(logs, money, logDetail, data);
detailData = oldMap.get(data.getiSeqno()); if (Common.isNotNull(data.getUniBusiId())) {
detailData = oldMap.get(data.getUniBusiId());
if (detailData != null) { if (detailData != null) {
// 收款人名称 // 收款人名称
logDetail.setFdPayee(detailData.getFdPayeeName()); logDetail.setFdPayee(detailData.getFdPayeeName());
...@@ -1447,6 +1453,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn ...@@ -1447,6 +1453,7 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
} }
detailDataList.add(detailData); detailDataList.add(detailData);
} }
}
logDetailList.add(logDetail); logDetailList.add(logDetail);
} }
ekpBankGrantLogDetailService.saveBatch(logDetailList); ekpBankGrantLogDetailService.saveBatch(logDetailList);
......
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