Skip to content

Y
yifu-mvp
Commit 7c24bb81 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

EKP1.7版本内容

parent f477e4ea
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 8 deletions
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @ 7c24bb81
...@@ -524,6 +524,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme ...@@ -524,6 +524,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
if(vo.getUrgencyExtent().equals(CommonConstants.SEVEN_STRING)){ if(vo.getUrgencyExtent().equals(CommonConstants.SEVEN_STRING)){
vo.setUrgencyExtent("常规(5-8小时)"); vo.setUrgencyExtent("常规(5-8小时)");
} }
if(vo.getUrgencyExtent().equals(CommonConstants.EIGHT_STRING)){
vo.setUrgencyExtent("较慢（1-2个月）");
}
List<TSettleDomainSelectVo> settleDomainR; List<TSettleDomainSelectVo> settleDomainR;
R<TSettleDomainListVo> listVo; R<TSettleDomainListVo> listVo;
listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(vo.getDeptNo()); listVo = archivesDaprUtil.selectSettleDomainSelectVoByNo(vo.getDeptNo());
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TConfigSalaryServiceImpl.java
View file @ 7c24bb81
...@@ -35,6 +35,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T ...@@ -35,6 +35,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
*/ */
@Override @Override
public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){ public R<IPage<TConfigSalary>> getTConfigSalaryPage(Page<TConfigSalary> page, TConfigSalary tConfigSalary){
/* 2023-09-13 段亚玲 按用户组授权，取消内置项目权限
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
TSettleDomainListVo vo = null; TSettleDomainListVo vo = null;
if (Common.isNotNull(user) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) { if (Common.isNotNull(user) && CommonConstants.ONE_STRING.equals(user.getSystemFlag())) {
...@@ -49,7 +50,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T ...@@ -49,7 +50,7 @@ public class TConfigSalaryServiceImpl extends ServiceImpl<TConfigSalaryMapper, T
} }
if (Common.isNotNull(vo)){ if (Common.isNotNull(vo)){
return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds())); return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, vo.getDeptIds()));
} }*/
return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, null)); return R.ok(baseMapper.getTConfigSalaryPage(page, tConfigSalary, null));
} }
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleSearchVo.java
View file @ 7c24bb81
...@@ -119,4 +119,12 @@ public class SocialHandleSearchVo extends TDispatchInfo { ...@@ -119,4 +119,12 @@ public class SocialHandleSearchVo extends TDispatchInfo {
@Schema(description = "导出的表头的Set") @Schema(description = "导出的表头的Set")
private Set<String> exportFields; private Set<String> exportFields;
/**
* 审核状态 0 通过 1 不通过
*/
@ExcelAttribute(name = "审核状态")
@ExcelIgnore
@Schema(description = "审核状态")
private String auditStatus;
} }
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 7c24bb81
...@@ -774,6 +774,10 @@ public class TDispatchInfoController { ...@@ -774,6 +774,10 @@ public class TDispatchInfoController {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN")); searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
} }
searchVo.setCreateBy(user.getId()); searchVo.setCreateBy(user.getId());
// 默认审核通过的数据 fxj 20230904
if (Common.isEmpty(searchVo.getAuditStatus())){
searchVo.setAuditStatus(CommonConstants.ZERO_STRING);
}
tDispatchInfoService.doexportSocialRecordNew(response,searchVo); tDispatchInfoService.doexportSocialRecordNew(response,searchVo);
} }
...@@ -796,6 +800,7 @@ public class TDispatchInfoController { ...@@ -796,6 +800,7 @@ public class TDispatchInfoController {
searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN")); searchVo.setAuthSql(searchVo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
} }
searchVo.setCreateBy(user.getId()); searchVo.setCreateBy(user.getId());
// 默认审核通过的数据 fxj 20230904
tDispatchInfoService.doexportSocialPensionRecord(response,searchVo); tDispatchInfoService.doexportSocialPensionRecord(response,searchVo);
} }
...@@ -823,14 +828,14 @@ public class TDispatchInfoController { ...@@ -823,14 +828,14 @@ public class TDispatchInfoController {
/** /**
* @Author wzb * @Author wzb
* @Description 导出 导出医保花名册 * @Description 导出住房公积金补缴清册
* @Date 10:05 2023/7/28 * @Date 10:05 2023/7/28
* @Param * @Param
* @return * @return
**/ **/
@PostMapping("/doexportFundSupplementaryInfo") @PostMapping("/doexportFundSupplementaryInfo")
@Operation(description = "导出住房公积金补缴申请书") @Operation(description = "导出住房公积金补缴清册")
@SysLog("导出住房公积金补缴申请书") @SysLog("导出住房公积金补缴清册")
public void doexportFundInfoOne(HttpServletResponse response, HttpServletRequest request, public void doexportFundInfoOne(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) { @RequestBody SocialHandleSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @ 7c24bb81
...@@ -1915,7 +1915,13 @@ ...@@ -1915,7 +1915,13 @@
<sql id="where_getSocialDisRecord"> <sql id="where_getSocialDisRecord">
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
AND a.social_id is not null AND a.social_id is not null
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0" '>
AND a.STATUS in ('2','4') AND a.STATUS in ('2','4')
</if>
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1" '>
AND a.STATUS in ('1','5')
</if>
AND a.DISPATCH_ITEM like concat('%','医疗','%') AND a.DISPATCH_ITEM like concat('%','医疗','%')
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"> <if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
...@@ -1942,9 +1948,15 @@ ...@@ -1942,9 +1948,15 @@
<sql id="where_getFundDisRecord"> <sql id="where_getFundDisRecord">
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
AND a.fund_id is not null AND a.fund_id is not null
AND a.STATUS in ('2','4')
AND a.DISPATCH_ITEM like concat('%','公积金','%') AND a.DISPATCH_ITEM like concat('%','公积金','%')
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0" '>
AND a.STATUS in ('2','4')
</if>
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1" '>
AND a.STATUS in ('1','5')
</if>
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"> <if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName} AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
</if> </if>
...@@ -1966,11 +1978,17 @@ ...@@ -1966,11 +1978,17 @@
<sql id="where_getFund"> <sql id="where_getFund">
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
AND a.fund_id is not null AND a.fund_id is not null
AND a.STATUS in ('2','4')
AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1) >0 AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1) >0
AND a.DISPATCH_ITEM like concat('%','公积金','%') AND a.DISPATCH_ITEM like concat('%','公积金','%')
AND a.Type=0 AND a.Type=0
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0" '>
AND a.STATUS in ('2','4')
</if>
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1" '>
AND a.STATUS in ('1','5')
</if>
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"> <if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName} AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
</if> </if>
...@@ -1993,7 +2011,14 @@ ...@@ -1993,7 +2011,14 @@
<sql id="where_getSocialPersionDisRecord"> <sql id="where_getSocialPersionDisRecord">
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
AND a.social_id is not null AND a.social_id is not null
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0"'>
AND a.STATUS in ('2','4') AND a.STATUS in ('2','4')
</if>
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1"'>
AND a.STATUS in ('1','5')
</if>
AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%') or a.DISPATCH_ITEM like concat('%','失业','%')) AND (a.DISPATCH_ITEM like concat('%','工伤','%') or a.DISPATCH_ITEM like concat('%','养老','%') or a.DISPATCH_ITEM like concat('%','失业','%'))
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''"> <if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
......
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