Commit 7da84ed7 authored by fangxinjiang's avatar fangxinjiang

项目限制 & 薪资人员导出优化

parent 4de518f8
......@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -26,10 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......@@ -41,7 +39,10 @@ import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -272,7 +273,13 @@ public class TSettleDomainController {
@Operation(summary = "修改项目表--EKP调用接口", description = "修改项目表--EKP调用接口")
@SysLog("修改项目表--EKP调用接口")
@PostMapping("/updateProjectInfo")
public R updateProjectInfo(@RequestBody List<TSettleDomain> list) {
public R updateProjectInfo(@RequestBody String jsonStr) {
try {
jsonStr = URLDecoder.decode(jsonStr, CommonConstants.UTF8).replace("=", "");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
List<TSettleDomainEkpVo> list= JSONObject.parseArray(jsonStr, TSettleDomainEkpVo.class);
return tSettleDomainService.updateProjectInfo(list);
}
......
......@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainEkpVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
......@@ -84,6 +85,6 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
**/
List<TSettleDomainSelectVo> selectAllSettleDomainSelectVos();
R updateProjectInfo(List<TSettleDomain> list);
R updateProjectInfo(List<TSettleDomainEkpVo> list);
}
......@@ -16,6 +16,7 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -31,10 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
......@@ -141,7 +139,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Transactional
@Override
public R updateProjectInfo(List<TSettleDomain> list) {
public R updateProjectInfo(List<TSettleDomainEkpVo> list) {
if (Common.isNotNull(list)) {
R<AreaMap> areaListR;
TSettleDomain tSettleDomainInfo;
......@@ -155,7 +153,10 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
Map<String,String> areaMap = areaListR.getData().getLabelIdMap();
R<SysUserListVo> res;
String errorStr;
for (TSettleDomain domain:list) {
TSettleDomain domain;
for (TSettleDomainEkpVo vo:list) {
domain = new TSettleDomain();
BeanUtil.copyProperties(vo,domain);
// 校验必填项
errorStr = checkInfo(domain);
if (Common.isNotNull(errorStr)){
......@@ -196,7 +197,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
private String checkInfo(TSettleDomain domain) {
if (Common.isEmpty(domain.getMId())){
if (Common.isEmpty(domain.getId())){
return "id 不可为空";
}
if (Common.isEmpty(domain.getDepartName())|| Common.isEmpty(domain.getDepartNo())){
......@@ -217,9 +218,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
|| Common.isEmpty(domain.getEProvince())){
return "省市不可为空";
}
if ( Common.isEmpty(domain.getCreateType())){
/*if ( Common.isEmpty(domain.getCreateType())){
return "创建类型不可为空";
}
}*/
if (Common.isEmpty(domain.getBusinessPrimaryType())
|| Common.isEmpty(domain.getBusinessSecondType())
|| Common.isEmpty(domain.getBusinessThirdType())){
......@@ -232,7 +233,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
我司到款单位名称 条件:当服务项目中有社保或公积金时必填
封面抬头-薪资 条件:当服务项目中有薪资时必填
封面抬头-商险 条件:当服务项目中有商险时必填 */
if (Common.isEmpty(domain.getServerItem())){
if (Common.isNotNull(domain.getServerItem())){
if (domain.getServerItem().indexOf("社保") != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getSocialType())){
return "社保结算类型不可为空";
......@@ -249,6 +250,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return "我司到款单位不可为空";
}
}
if (domain.getServerItem().indexOf("薪资") != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getInvoiceTitleSalary())){
return "封面台头-薪资不可为空";
}
}
if (domain.getServerItem().indexOf("商险") != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getInsuranceSettleType())){
return "商险结算类型不可为空";
......@@ -287,7 +293,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
}
if (Common.isNotNull(tSettleDomain.getECity())){
areaId = areaMap.get(tSettleDomain.getECity());
areaId = areaMap.get(tSettleDomain.getECity()+CommonConstants.DOWN_LINE_STRING+tSettleDomain.getEProvince());
if (Common.isNotNull(areaId)){
tSettleDomain.setCity(Integer.parseInt(areaId));
}else {
......@@ -295,7 +301,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
}
}
if (Common.isNotNull(tSettleDomain.getETown())){
areaId = areaMap.get(tSettleDomain.getETown());
areaId = areaMap.get(tSettleDomain.getETown()+CommonConstants.DOWN_LINE_STRING+tSettleDomain.getECity());
if (Common.isNotNull(areaId)){
tSettleDomain.setTown(Integer.parseInt(areaId));
}else {
......
......@@ -117,12 +117,12 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
searchVo.setLimitStart(i);
searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
list = noPageDiy(searchVo);
if (Common.isNotNull(list)) {
/*if (Common.isNotNull(list)) {
util = new ExcelUtil<>(TSalaryEmployeeExportVo.class);
for (TSalaryEmployeeExportVo vo : list) {
util.convertEntity(vo, null, null, null);
}
}
}*/
if (Common.isNotNull(list)) {
writeSheet = EasyExcel.writerSheet("薪酬人员表" + index).build();
excelWriter.write(list, writeSheet);
......
......@@ -182,8 +182,34 @@
<select id="noPageDiy" resultMap="salaryEmployeeExportMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryEmployeeExportVo">
SELECT
<include refid="Base_Column_List"/>
a.ID,
a.EMP_NAME,
a.EMP_IDCARD,
a.UNIT_ID,
a.UNIT_NAME,
a.UNIT_NO,
a.DEPT_ID,
a.DEPT_NAME,
a.DEPT_NO,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.BANK_NAME,
a.BANK_SUB_NAME,
a.BANK_NO,
a.INVOICE_TITLE,
a1.area_name as "BANK_PROVINCE",
a2.area_name as "BANK_CITY",
a.EMP_PHONE,
a.TAX_MONTH,
case when a.FILE_STATUS = 0 then "在职"
when a.FILE_STATUS = 1 then "离职"
else null end as "FILE_STATUS"
FROM t_salary_employee a
left join sys_area a1 on a1.id=a.BANK_PROVINCE
left join sys_area a2 on a2.id=a.BANK_CITY
<where>
1=1
<include refid="where_export"/>
......
......@@ -150,8 +150,7 @@ public class AreaController {
+ CommonConstants.DOWN_LINE_STRING
+ (Common.isNotNull(temp) ? temp.getAreaName() : ""), area.getId().toString());
} else {
labelIdMap.put(CacheConstants.AREA_VALUE
+ area.getAreaName(), area.getId().toString());
labelIdMap.put(area.getAreaName(), area.getId().toString());
}
}
redisUtil.set(CacheConstants.AREA_VALUE_GROUP,labelIdMap);
......
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