Commit 979adde1 authored by fangxinjiang's avatar fangxinjiang

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

parents 53eddca0 8852e440
......@@ -1048,6 +1048,9 @@ public class TSocialInfo extends BaseEntity {
// 派单id,社保士兵使用
@TableField(exist = false)
private String dispatchId;
// 派单类型0派增1派减,社保士兵使用
@TableField(exist = false)
private String dispatchType;
// 过期Flag,0未过期,1过期,社保士兵使用(过期的自动变为中止办理)
@TableField(exist = false)
private String ygsOverDueFlag;
......
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author hgw
* @Description 社保士兵功能设置
* @Date 2024-5-15 18:15:50
**/
@Data
public class SocialSoldierSetVo implements Serializable {
@ExcelProperty("是否自动提交")
private String isAutoSubmit;
@ExcelProperty("是否自动补充信息")
private String isAutoInsert;
@ExcelProperty("是否上传附件材料")
private String isAutoUpload;
@ExcelProperty("提示已缴费是否继续申报")
private String isDoShenBao;
}
......@@ -88,6 +88,7 @@ public class FailReasonConfigController {
public R<Boolean> updateById(@RequestBody FailReasonConfig failReasonConfig) {
FailReasonConfig failReasonCount = failReasonConfigService.getOne(Wrappers.<FailReasonConfig>query().lambda()
.eq(FailReasonConfig::getReasonKey,failReasonConfig.getReasonKey())
.ne(FailReasonConfig::getId,failReasonConfig.getId())
.last(CommonConstants.LAST_ONE_SQL));
if(Optional.ofNullable(failReasonCount).isPresent()) {
return R.failed("已存在对应的关键字的失败原因配置!");
......
......@@ -17,6 +17,8 @@
package com.yifu.cloud.plus.v1.yifu.social.service.impl;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
......@@ -27,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierPushService;
import com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierSetVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
......@@ -97,14 +100,26 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
return R.ok("推送成功!");
}
public MultipartFile getFile(List<SocialSoldierYgsAddVo> list) {
File file = null;
public MultipartFile getFile(List<SocialSoldierYgsAddVo> list, int type) {
if (list != null) {
String filePath = "socialFile" + DateUtil.getThisTime() + CommonConstants.XLSX;
EasyExcelFactory.write(filePath, SocialSoldierYgsAddVo.class).sheet("社保明细").doWrite(list);
file = new File(filePath);
}
if (file != null) {
String fileName = "socialSoldierFile" + DateUtil.getThisTime() + CommonConstants.XLSX;
ExcelWriter excelWriter = EasyExcelFactory.write(fileName).build();
WriteSheet writeSheet = EasyExcelFactory.writerSheet("社保明细").head(SocialSoldierYgsAddVo.class).build();
excelWriter.write(list, writeSheet);
if (type == 2) {
List<SocialSoldierSetVo> setList = new ArrayList<>();
SocialSoldierSetVo vo = new SocialSoldierSetVo();
vo.setIsAutoSubmit("否");
vo.setIsAutoInsert("否");
vo.setIsAutoUpload("否");
vo.setIsDoShenBao("否");
setList.add(vo);
WriteSheet writeSheet2 = EasyExcelFactory.writerSheet("功能设置").head(SocialSoldierSetVo.class).build();
excelWriter.write(setList, writeSheet2);
}
File file = new File(fileName);
excelWriter.finish();
return getMultipartFile(file);
}
return null;
......@@ -149,7 +164,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo.setId(vo.getSocialId());
socialIdList.add(socialInfo);
}
MultipartFile file = this.getFile(ygsAddlist);
MultipartFile file = this.getFile(ygsAddlist, 1);
if (Common.isNotNull(file)) {
log.error("社保增员");
this.getOneAppGetModuleDetail(socialIdList, file, "社保增员");
......@@ -165,7 +180,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo.setId(vo.getSocialId());
socialIdList.add(socialInfo);
}
MultipartFile file = this.getFile(ygsReducelist);
MultipartFile file = this.getFile(ygsReducelist, 2);
if (Common.isNotNull(file)) {
log.error("社保减员");
this.getOneAppGetModuleDetail(socialIdList, file, "社保减员");
......@@ -181,7 +196,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo.setId(vo.getSocialId());
socialIdList.add(socialInfo);
}
MultipartFile file = this.getFile(ysdAddlist);
MultipartFile file = this.getFile(ysdAddlist, 3);
if (Common.isNotNull(file)) {
log.error("医保增员");
this.getOneAppGetModuleDetail(socialIdList, file, "医保增员");
......@@ -197,7 +212,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo.setId(vo.getSocialId());
socialIdList.add(socialInfo);
}
MultipartFile file = this.getFile(ysdReducelist);
MultipartFile file = this.getFile(ysdReducelist, 4);
if (Common.isNotNull(file)) {
log.error("医保减员");
this.getOneAppGetModuleDetail(socialIdList, file, "医保减员");
......
......@@ -147,6 +147,7 @@
<result property="ygsAddId" column="YGS_ADD_ID"/>
<result property="ysdAddId" column="YSD_ADD_ID"/>
<result property="dispatchId" column="DISPATCH_ID"/>
<result property="dispatchType" column="DISPATCH_TYPE"/>
<result property="ygsOverDueFlag" column="YGS_OVER_DUE_FLAG"/>
<result property="ysdOverDueFlag" column="YSD_OVER_DUE_FLAG"/>
</resultMap>
......@@ -593,6 +594,7 @@
a.HANDLE_STATUS,
a.YGS_HANDLE_STATUS,
d.id as DISPATCH_ID,
d.type as DISPATCH_TYPE,
if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id is null and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')),0 ,1) YGS_OVER_DUE_FLAG
FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id
......@@ -613,6 +615,7 @@ if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) or ( sd.id
a.HANDLE_STATUS,
a.YSD_HANDLE_STATUS,
d.id as DISPATCH_ID,
d.type as DISPATCH_TYPE,
if((sd.id is not null and NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE) or ( sd.id is null and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')),0 ,1) YSD_OVER_DUE_FLAG
FROM t_social_info a
left join t_dispatch_info d on d.SOCIAL_ID = a.id
......
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