Skip to content

Y
yifu-mvp
Commit f1b5b3e8 authored by huyuchen's avatar huyuchen
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 96796111 ef20be85
Show whitespace changes
Inline Side-by-side
Showing with 257 additions and 102 deletions
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/SysMessageSalary.java
View file @ f1b5b3e8
...@@ -157,13 +157,6 @@ public class SysMessageSalary extends BaseEntity { ...@@ -157,13 +157,6 @@ public class SysMessageSalary extends BaseEntity {
@ExcelAttribute(name = "应发工资") @ExcelAttribute(name = "应发工资")
@ExcelProperty("应发工资") @ExcelProperty("应发工资")
private BigDecimal relaySalary; private BigDecimal relaySalary;
/**
* 反馈
*/
@ExcelAttribute(name = "反馈", maxLength = 300)
@Length(max = 300, message = "反馈不能超过300个字符")
@ExcelProperty("反馈")
private String feedback;
/** /**
* 有忽略提醒 0：忽略 1：不忽略 * 有忽略提醒 0：忽略 1：不忽略
*/ */
...@@ -199,5 +192,5 @@ public class SysMessageSalary extends BaseEntity { ...@@ -199,5 +192,5 @@ public class SysMessageSalary extends BaseEntity {
@Schema(description = "反馈原因", name = "reasonType") @Schema(description = "反馈原因", name = "reasonType")
@ExcelAttribute(name = "反馈原因", maxLength = 32) @ExcelAttribute(name = "反馈原因", maxLength = 32)
@ExcelProperty(value = "反馈原因") @ExcelProperty(value = "反馈原因")
private Integer feedBack; private String feedBack;
} }
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/SysMessageSalaryExportVo.java
View file @ f1b5b3e8
...@@ -36,7 +36,7 @@ import java.time.LocalDateTime; ...@@ -36,7 +36,7 @@ import java.time.LocalDateTime;
* @date 2022-08-05 11:40:14 * @date 2022-08-05 11:40:14
*/ */
@Data @Data
public class SysMessageSalaryExportVo extends SysMessageSalary { public class SysMessageSalaryExportVo {
/** /**
* 客户名称 * 客户名称
*/ */
...@@ -46,12 +46,12 @@ public class SysMessageSalaryExportVo extends SysMessageSalary { ...@@ -46,12 +46,12 @@ public class SysMessageSalaryExportVo extends SysMessageSalary {
@ExcelProperty("客户名称") @ExcelProperty("客户名称")
private String customerName; private String customerName;
/** /**
* 部门名称 * 项目名称
*/ */
@ExcelAttribute(name = "部门名称", isNotEmpty = true, errorInfo = "部门名称不能为空", maxLength = 50) @ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目名称不能为空", maxLength = 50)
@NotBlank(message = "部门名称不能为空") @NotBlank(message = "项目名称不能为空")
@Length(max = 50, message = "部门名称不能超过50个字符") @Length(max = 50, message = "项目名称不能超过50个字符")
@ExcelProperty("部门名称") @ExcelProperty("项目名称")
private String departName; private String departName;
/** /**
* 员工姓名 * 员工姓名
...@@ -61,20 +61,26 @@ public class SysMessageSalaryExportVo extends SysMessageSalary { ...@@ -61,20 +61,26 @@ public class SysMessageSalaryExportVo extends SysMessageSalary {
@ExcelProperty("员工姓名") @ExcelProperty("员工姓名")
private String employeeName; private String employeeName;
/** /**
* employeeIdnum * 身份证号
*/ */
@ExcelAttribute(name = "employeeIdnum", maxLength = 50) @ExcelAttribute(name = "身份证号", maxLength = 50)
@Length(max = 50, message = "employeeIdnum不能超过50个字符") @Length(max = 50, message = "身份证号身份证号")
@ExcelProperty("employeeIdnum") @ExcelProperty("身份证号")
private String employeeIdnum; private String employeeIdnum;
/** /**
* 工资月 * 工资月
*/ */
@ExcelAttribute(name = "工资月", maxLength = 10) @ExcelAttribute(name = "工资月", maxLength = 10)
@Length(max = 10, message = "工资月不能超过10个字符") @Length(max = 10, message = "工资月不能超过10个字符")
@ExcelProperty("工资月") @ExcelProperty("工资月份")
private String salaryMonth; private String salaryMonth;
/**
* 应发工资
*/
@ExcelAttribute(name = "应发工资")
@ExcelProperty("应发工资")
private BigDecimal relaySalary;
/** /**
* 实发工资 * 实发工资
*/ */
...@@ -82,30 +88,24 @@ public class SysMessageSalaryExportVo extends SysMessageSalary { ...@@ -82,30 +88,24 @@ public class SysMessageSalaryExportVo extends SysMessageSalary {
@NotBlank(message = "实发工资不能为空") @NotBlank(message = "实发工资不能为空")
@ExcelProperty("实发工资") @ExcelProperty("实发工资")
private BigDecimal actualSalary; private BigDecimal actualSalary;
/**
* 应发工资
*/
@ExcelAttribute(name = "应发工资")
@ExcelProperty("应发工资")
private BigDecimal relaySalary;
/** /**
* 省 * 省
*/ */
@ExcelAttribute(name = "省") @ExcelAttribute(name = "省", isArea = true)
@ExcelProperty("省") @ExcelProperty("项目-省")
private Integer province; private String province;
/** /**
* 市 * 市
*/ */
@ExcelAttribute(name = "市") @ExcelAttribute(name = "市", isArea = true,parentField = "province")
@ExcelProperty("市") @ExcelProperty("项目-市")
private Integer city; private String city;
/** /**
* 县 * 县
*/ */
@ExcelAttribute(name = "县") @ExcelAttribute(name = "县", isArea = true,parentField = "city")
@ExcelProperty("县") @ExcelProperty("项目-县")
private Integer town; private String town;
/** /**
* 最低工资标准 * 最低工资标准
*/ */
...@@ -119,22 +119,14 @@ public class SysMessageSalaryExportVo extends SysMessageSalary { ...@@ -119,22 +119,14 @@ public class SysMessageSalaryExportVo extends SysMessageSalary {
@ExcelAttribute(name = "工资制表人-创建人", maxLength = 32) @ExcelAttribute(name = "工资制表人-创建人", maxLength = 32)
@Length(max = 32, message = "工资制表人-创建人不能超过32个字符") @Length(max = 32, message = "工资制表人-创建人不能超过32个字符")
@ExcelProperty("创建人") @ExcelProperty("创建人")
private String salaryMakeMan; private String createName;
/** /**
* 反馈 * 反馈
*/ */
@ExcelAttribute(name = "反馈", maxLength = 300) @ExcelAttribute(name = "反馈", maxLength = 300)
@Length(max = 300, message = "反馈不能超过300个字符") @Length(max = 300, message = "反馈不能超过300个字符")
@ExcelProperty("反馈") @ExcelProperty("反馈原因")
private String feedback; private String feedback;
/**
* 原因大类 根据数据字典来判断
*/
@TableField(exist = false)
@Schema(description = "原因大类 根据数据字典来判断 ", name = "reasonType")
@ExcelAttribute(name = "原因大类", errorInfo = "原因大类不能为空", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.HAVE_SALARY_NO_SOCIAL_TYPE, needExport = true)
private Integer reasonType;
} }
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/THaveSalaryNoSocialExportVo.java
View file @ f1b5b3e8
...@@ -20,7 +20,7 @@ import java.io.Serializable; ...@@ -20,7 +20,7 @@ import java.io.Serializable;
* @Version 1.0 * @Version 1.0
*/ */
@Data @Data
public class THaveSalaryNoSocialExportVo extends THaveSalaryNosocial implements Serializable { public class THaveSalaryNoSocialExportVo implements Serializable {
/** /**
* 客户名称 * 客户名称
...@@ -73,6 +73,13 @@ public class THaveSalaryNoSocialExportVo extends THaveSalaryNosocial implements ...@@ -73,6 +73,13 @@ public class THaveSalaryNoSocialExportVo extends THaveSalaryNosocial implements
@ExcelProperty(value = "应发工资") @ExcelProperty(value = "应发工资")
private String relaySalary; private String relaySalary;
/**
* 创建者-姓名
*/
@Schema(description = "创建人-姓名")
@TableField(fill = FieldFill.INSERT)
@ExcelProperty("创建人")
private String createName;
/** /**
* 反馈原因 * 反馈原因
*/ */
...@@ -81,11 +88,4 @@ public class THaveSalaryNoSocialExportVo extends THaveSalaryNosocial implements ...@@ -81,11 +88,4 @@ public class THaveSalaryNoSocialExportVo extends THaveSalaryNosocial implements
@ExcelProperty(value = "反馈原因") @ExcelProperty(value = "反馈原因")
private String feedBack; private String feedBack;
/**
* 创建者-姓名
*/
@Schema(description = "创建人-姓名")
@TableField(fill = FieldFill.INSERT)
@ExcelProperty("创建人")
private String createName;
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
View file @ f1b5b3e8
...@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial; import com.yifu.cloud.plus.v1.yifu.salary.entity.THaveSalaryNosocial;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount;
import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -88,4 +89,9 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> { ...@@ -88,4 +89,9 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
**/ **/
List<String> getAccountYearCheckList(); List<String> getAccountYearCheckList();
List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
@Param("idList")List<String> idList);
int noPageCountDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
@Param("idList")List<String> idList);
} }
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SysMessageSalaryServiceImpl.java
View file @ f1b5b3e8
...@@ -150,7 +150,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap ...@@ -150,7 +150,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
**/ **/
@Override @Override
public void listExport(HttpServletResponse response, SysMessageSalarySearchVo searchVo) { public void listExport(HttpServletResponse response, SysMessageSalarySearchVo searchVo) {
String fileName = "最低工资提醒导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "最低工资提醒查询批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<SysMessageSalaryExportVo> list = new ArrayList<>(); List<SysMessageSalaryExportVo> list = new ArrayList<>();
// TODO // TODO
...@@ -246,7 +246,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap ...@@ -246,7 +246,7 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
return R.failed("允许创建人反馈信息！"); return R.failed("允许创建人反馈信息！");
} }
entity.setReasonType(reasonType); entity.setReasonType(reasonType);
entity.setFeedback(feedBack); entity.setFeedBack(feedBack);
int res = baseMapper.updateById(entity); int res = baseMapper.updateById(entity);
if (res == CommonConstants.ONE_INT_NEGATE){ if (res == CommonConstants.ONE_INT_NEGATE){
return R.failed(CommonConstants.SAVE_FAILED); return R.failed(CommonConstants.SAVE_FAILED);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java
View file @ f1b5b3e8
...@@ -191,7 +191,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc ...@@ -191,7 +191,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
**/ **/
@Override @Override
public void listExport(HttpServletResponse response, THaveSalaryNosocialSearchVo searchVo) { public void listExport(HttpServletResponse response, THaveSalaryNosocialSearchVo searchVo) {
String fileName = "消息提醒导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "有工资无社保查询批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<THaveSalaryNoSocialExportVo> list = new ArrayList<>(); List<THaveSalaryNoSocialExportVo> list = new ArrayList<>();
// TODO // TODO
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @ f1b5b3e8
...@@ -74,7 +74,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -74,7 +74,7 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
*/ */
@Override @Override
public void listExport(HttpServletResponse response, TSalaryAccountSearchVo searchVo) { public void listExport(HttpServletResponse response, TSalaryAccountSearchVo searchVo) {
String fileName = "员工报账批量导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "员工报账查询批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<TSalaryAccount> list = new ArrayList<>(); List<TSalaryAccount> list = new ArrayList<>();
long count = noPageCountDiy(searchVo); long count = noPageCountDiy(searchVo);
...@@ -133,28 +133,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper, ...@@ -133,28 +133,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
@Override @Override
public List<TSalaryAccount> noPageDiy(TSalaryAccountSearchVo searchVo) { public List<TSalaryAccount> noPageDiy(TSalaryAccountSearchVo searchVo) {
LambdaQueryWrapper<TSalaryAccount> wrapper = buildQueryWrapper(searchVo); return baseMapper.noPageDiy(searchVo,searchVo.getIdList());
if (Common.isNotNull(searchVo.getIdList())) {
wrapper.in(TSalaryAccount::getId, searchVo.getIdList());
}
if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
}
wrapper.orderByDesc(TSalaryAccount::getSalaryMonth);
return baseMapper.selectList(wrapper);
}
private Long noPageCountDiy(TSalaryAccountSearchVo searchVo) {
LambdaQueryWrapper<TSalaryAccount> wrapper = buildQueryWrapper(searchVo);
if (Common.isNotNull(searchVo.getIdList())) {
wrapper.in(TSalaryAccount::getId, searchVo.getIdList());
}
return baseMapper.selectCount(wrapper);
} }
private LambdaQueryWrapper buildQueryWrapper(TSalaryAccountSearchVo entity) { private int noPageCountDiy(TSalaryAccountSearchVo searchVo) {
LambdaQueryWrapper<TSalaryAccount> wrapper = Wrappers.lambdaQuery(); return baseMapper.noPageCountDiy(searchVo,searchVo.getIdList());
return wrapper;
} }
@Override @Override
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java
View file @ f1b5b3e8
...@@ -91,7 +91,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -91,7 +91,7 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
*/ */
@Override @Override
public void listExport(HttpServletResponse response, TSalaryEmployeeSearchVo searchVo) { public void listExport(HttpServletResponse response, TSalaryEmployeeSearchVo searchVo) {
String fileName = "薪酬人员表批量导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "薪酬人员查询批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<TSalaryEmployeeExportVo> list = new ArrayList<>(); List<TSalaryEmployeeExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo); long count = noPageCountDiy(searchVo);
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @ f1b5b3e8
...@@ -102,7 +102,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -102,7 +102,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
*/ */
@Override @Override
public void listExport(HttpServletResponse response, TSalaryStandardSearchVo searchVo) { public void listExport(HttpServletResponse response, TSalaryStandardSearchVo searchVo) {
String fileName = "项目薪酬查询导出" + DateUtil.getThisTime() + ".xlsx"; String fileName = "项目薪酬查询批量导出" + DateUtil.getThisTime() + ".xlsx";
//获取要导出的列表 //获取要导出的列表
List<TSalaryStandardExportVo> list = new ArrayList<>(); List<TSalaryStandardExportVo> list = new ArrayList<>();
long count = noPageCountDiy(searchVo); long count = noPageCountDiy(searchVo);
...@@ -161,13 +161,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -161,13 +161,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
@Override @Override
public List<TSalaryStandardExportVo> noPageDiy(TSalaryStandardSearchVo searchVo) { public List<TSalaryStandardExportVo> noPageDiy(TSalaryStandardSearchVo searchVo) {
List<String> idList = Common.getList(searchVo.getIds()); return baseMapper.getSalaryStandardExport(searchVo,Common.getList(searchVo.getIds()));
return baseMapper.getSalaryStandardExport(searchVo,idList);
} }
private int noPageCountDiy(TSalaryStandardSearchVo searchVo) { private int noPageCountDiy(TSalaryStandardSearchVo searchVo) {
List<String> idList = Common.getList(searchVo.getIds()); return baseMapper.getSalaryStandardExportCount(searchVo,Common.getList(searchVo.getIds()));
return baseMapper.getSalaryStandardExportCount(searchVo,idList);
} }
@Override @Override
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
View file @ f1b5b3e8
...@@ -21,6 +21,18 @@ ...@@ -21,6 +21,18 @@
<result property="customerId" column="CUSTOMER_ID"/> <result property="customerId" column="CUSTOMER_ID"/>
<result property="customerName" column="CUSTOMER_NAME"/> <result property="customerName" column="CUSTOMER_NAME"/>
</resultMap> </resultMap>
<resultMap id="sysMessageSalaryExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.SysMessageSalaryExportVo">
<result property="actualSalary" column="actual_salary"/>
<result property="salaryBase" column="salary_base"/>
<result property="salaryMonth" column="salary_month"/>
<result property="employeeName" column="employee_name"/>
<result property="employeeIdnum" column="employee_idnum"/>
<result property="province" column="province"/>
<result property="city" column="city"/>
<result property="town" column="town"/>
<result property="departName" column="DEPART_NAME"/>
<result property="customerName" column="CUSTOMER_NAME"/>
</resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
a.actual_salary, a.actual_salary,
...@@ -39,9 +51,12 @@ ...@@ -39,9 +51,12 @@
a.DEPART_NAME, a.DEPART_NAME,
a.DEPART_NO, a.DEPART_NO,
a.type, a.type,
a.FEEDBACK, a.FEED_BACK,
a.CUSTOMER_NAME, a.CUSTOMER_NAME,
a.CUSTOMER_ID a.CUSTOMER_ID,
a.REASON_TYPE,
a.CREATE_BY,
a.CREATE_NAME
</sql> </sql>
<sql id="sysMessageSalary_where"> <sql id="sysMessageSalary_where">
<if test="sysMessageSalary != null"> <if test="sysMessageSalary != null">
...@@ -158,7 +173,7 @@ ...@@ -158,7 +173,7 @@
employee_id, employee_id,
employee_name, employee_name,
employee_idnum, employee_idnum,
salary_make_man, create_by,
province, province,
city, city,
town, town,
...@@ -180,7 +195,7 @@ ...@@ -180,7 +195,7 @@
a.SETTLEMENT_MONTH settle_month, a.SETTLEMENT_MONTH settle_month,
sum(i.SALARY_MONEY) AS actual_salary, sum(i.SALARY_MONEY) AS actual_salary,
sum(l.SALARY_MONEY) AS relay_Salary, sum(l.SALARY_MONEY) AS relay_Salary,
s.CREATE_USER AS salary_make_man, s.createBy AS create_by,
min(IFNULL(t.salary_base,c.salary_base)) AS salary_base, min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
a.PROVINCE, a.PROVINCE,
a.CITY, a.CITY,
...@@ -262,7 +277,7 @@ ...@@ -262,7 +277,7 @@
<!--noPageDiy查询--> <!--noPageDiy查询-->
<select id="noPageDiy" resultMap="sysMessageSalaryMap"> <select id="noPageDiy" resultMap="sysMessageSalaryExportMap">
SELECT SELECT
<include refid="Base_Column_List"/>, <include refid="Base_Column_List"/>,
b.* b.*
...@@ -305,7 +320,7 @@ ...@@ -305,7 +320,7 @@
and 1=2 and 1=2
</if> </if>
</if> </if>
<if test="settleDomainVos == null"> <if test="settleDomainIds == null">
and 1=1 and 1=1
</if> </if>
<if test='sql != null and sql != ""'> <if test='sql != null and sql != ""'>
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
View file @ f1b5b3e8
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<result property="settlementOrganName" column="SETTLEMENT_ORGAN_NAME"/> <result property="settlementOrganName" column="SETTLEMENT_ORGAN_NAME"/>
<result property="settlementOrganNo" column="SETTLEMENT_ORGAN_NO"/> <result property="settlementOrganNo" column="SETTLEMENT_ORGAN_NO"/>
<result property="feedBack" column="FEEDBACK"/> <result property="feedBack" column="FEEDBACK"/>
<result property="reasonType" column="REASON_TYPE"/>
<result property="month" column="month"/> <result property="month" column="month"/>
</resultMap> </resultMap>
<resultMap id="haveSalaryNoSocialExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.THaveSalaryNoSocialExportVo"> <resultMap id="haveSalaryNoSocialExportMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.THaveSalaryNoSocialExportVo">
...@@ -39,7 +40,8 @@ ...@@ -39,7 +40,8 @@
a.SETTLE_MONTH, a.SETTLE_MONTH,
a.relay_salary, a.relay_salary,
a.FEEDBACK, a.FEEDBACK,
a.CREATE_NAME a.CREATE_NAME,
a.REASON_TYPE
</sql> </sql>
<sql id="tHaveSalaryNosocial_where"> <sql id="tHaveSalaryNosocial_where">
<if test="tHaveSalaryNosocial != null"> <if test="tHaveSalaryNosocial != null">
...@@ -85,6 +87,7 @@ ...@@ -85,6 +87,7 @@
<!--tHaveSalaryNosocial简单分页查询--> <!--tHaveSalaryNosocial简单分页查询-->
<select id="getTHaveSalaryNosocialPage" resultMap="tHaveSalaryNosocialMap"> <select id="getTHaveSalaryNosocialPage" resultMap="tHaveSalaryNosocialMap">
SELECT SELECT
a.id,
a.employee_name, a.employee_name,
a.employee_id_card, a.employee_id_card,
a.CUSTOMER_NAME, a.CUSTOMER_NAME,
...@@ -209,8 +212,11 @@ ...@@ -209,8 +212,11 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
,b.* ,b.*
FROM t_have_salary_nosocial a FROM t_have_salary_nosocial a
left join t_feed_back b on a.ID=b.RELATE_ID
<where>
1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=1) or (b.id is null)) 1=1 and ((b.IGNORE_FLAG=1 and b.TYPE=1) or (b.id is null))
<include refid="export_where"/> <include refid="export_where"/>
</where>
</select> </select>
<select id="noPageCountDiy" resultType="java.lang.Integer"> <select id="noPageCountDiy" resultType="java.lang.Integer">
SELECT SELECT
...@@ -242,7 +248,7 @@ ...@@ -242,7 +248,7 @@
and 1=2 and 1=2
</if> </if>
</if> </if>
<if test="settleDomainVos == null"> <if test="settleDomainIds == null">
and 1=1 and 1=1
</if> </if>
<if test='sql != null and sql != ""'> <if test='sql != null and sql != ""'>
......
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @ f1b5b3e8
...@@ -255,8 +255,9 @@ ...@@ -255,8 +255,9 @@
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_salary_account a FROM t_salary_account a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="tSalaryAccount_where"/> <include refid="tSalaryAccount_where"/>
</where> </where>
order by a.CREATE_TIME desc order by a.CREATE_TIME desc
...@@ -352,4 +353,165 @@ ...@@ -352,4 +353,165 @@
from t_salary_account a from t_salary_account a
where a.DELETE_FLAG = 0 and a.FORM_TYPE = '0' and a.SALARY_MONTH like concat(DATE_FORMAT(NOW(), '%Y'), '%') where a.DELETE_FLAG = 0 and a.FORM_TYPE = '0' and a.SALARY_MONTH like concat(DATE_FORMAT(NOW(), '%Y'), '%')
</select> </select>
<select id="noPageDiy" resultMap="tSalaryAccountMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount">
SELECT
<include refid="Base_Column_List"/>
FROM t_salary_account a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/>
ORDER BY a.CREATE_TIME desc
<if test="searchVo != null">
<if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd}
</if>
</if>
</where>
</select>
<select id="noPageCountDiy" resultType="java.lang.Integer">
SELECT
count(1)
FROM t_salary_account a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where>
a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/>
</where>
</select>
<sql id="where_export">
<if test="idList != null and idList.size>0">
AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
<if test="searchVo != null">
<if test="searchVo.id != null and searchVo.id.trim() != ''">
AND a.ID = #{searchVo.id}
</if>
<if test="searchVo.invoiceTitle != null and searchVo.invoiceTitle.trim() != ''">
AND a.INVOICE_TITLE = #{searchVo.invoiceTitle}
</if>
<if test="searchVo.salaryFormId != null and searchVo.salaryFormId.trim() != ''">
AND a.SALARY_FORM_ID = #{searchVo.salaryFormId}
</if>
<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
AND a.SALARY_MONTH = #{searchVo.salaryMonth}
</if>
<if test="searchVo.empId != null and searchVo.empId.trim() != ''">
AND a.EMP_ID = #{searchVo.empId}
</if>
<if test="searchVo.empName != null and searchVo.empName.trim() != ''">
AND a.EMP_NAME = #{searchVo.empName}
</if>
<if test="searchVo.empIdcard != null and searchVo.empIdcard.trim() != ''">
AND a.EMP_IDCARD = #{searchVo.empIdcard}
</if>
<if test="searchVo.bankNo != null and searchVo.bankNo.trim() != ''">
AND a.BANK_NO = #{searchVo.bankNo}
</if>
<if test="searchVo.bankName != null and searchVo.bankName.trim() != ''">
AND a.BANK_NAME = #{searchVo.bankName}
</if>
<if test="searchVo.deptId != null and searchVo.deptId.trim() != ''">
AND a.DEPT_ID = #{searchVo.deptId}
</if>
<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
AND a.DEPT_NO = #{searchVo.deptNo}
</if>
<if test="searchVo.deptName != null and searchVo.deptName.trim() != ''">
AND a.DEPT_NAME = #{searchVo.deptName}
</if>
<if test="searchVo.salaryStyle != null and searchVo.salaryStyle.trim() != ''">
AND a.SALARY_STYLE = #{searchVo.salaryStyle}
</if>
<if test="searchVo.salaryGiveTime != null and searchVo.salaryGiveTime.trim() != ''">
AND a.SALARY_GIVE_TIME = #{searchVo.salaryGiveTime}
</if>
<if test="searchVo.distributionFlag != null and searchVo.distributionFlag.trim() != ''">
AND a.DISTRIBUTION_FLAG = #{searchVo.distributionFlag}
</if>
<if test="searchVo.deduSocialMonth != null and searchVo.deduSocialMonth.trim() != ''">
AND a.DEDU_SOCIAL_MONTH = #{searchVo.deduSocialMonth}
</if>
<if test="searchVo.deduProvidentMonth != null and searchVo.deduProvidentMonth.trim() != ''">
AND a.DEDU_PROVIDENT_MONTH = #{searchVo.deduProvidentMonth}
</if>
<if test="searchVo.formType != null and searchVo.formType.trim() != ''">
AND a.FORM_TYPE = #{searchVo.formType}
</if>
<if test="searchVo.settlementMonth != null and searchVo.settlementMonth.trim() != ''">
AND a.SETTLEMENT_MONTH = #{searchVo.settlementMonth}
</if>
<if test="searchVo.deleteFlag != null">
AND a.DELETE_FLAG = #{searchVo.deleteFlag}
</if>
<if test="searchVo.socialPriority != null and searchVo.socialPriority.trim() != ''">
AND a.SOCIAL_PRIORITY = #{searchVo.socialPriority}
</if>
<if test="searchVo.fundPriority != null and searchVo.fundPriority.trim() != ''">
AND a.FUND_PRIORITY = #{searchVo.fundPriority}
</if>
<if test="searchVo.annualBonusType != null and searchVo.annualBonusType.trim() != ''">
AND a.ANNUAL_BONUS_TYPE = #{searchVo.annualBonusType}
</if>
<if test="searchVo.taxMonth != null and searchVo.taxMonth.trim() != ''">
AND a.TAX_MONTH = #{searchVo.taxMonth}
</if>
<if test="searchVo.isDeductSocial != null and searchVo.isDeductSocial.trim() != ''">
AND a.IS_DEDUCT_SOCIAL = #{searchVo.isDeductSocial}
</if>
<if test="searchVo.isDeductFund != null and searchVo.isDeductFund.trim() != ''">
AND a.IS_DEDUCT_FUND = #{searchVo.isDeductFund}
</if>
<if test="searchVo.province != null">
AND a.PROVINCE = #{searchVo.province}
</if>
<if test="searchVo.city != null">
AND a.CITY = #{searchVo.city}
</if>
<if test="searchVo.town != null">
AND a.TOWN = #{searchVo.town}
</if>
<if test="searchVo.empPhone != null and searchVo.empPhone.trim() != ''">
AND a.EMP_PHONE = #{searchVo.empPhone}
</if>
<if test="searchVo.ownFlag != null">
AND a.OWN_FLAG = #{searchVo.ownFlag}
</if>
<if test="searchVo.isRepeat != null">
AND a.IS_REPEAT = #{searchVo.isRepeat}
</if>
<if test="searchVo.bankSubName != null and searchVo.bankSubName.trim() != ''">
AND a.BANK_SUB_NAME = #{searchVo.bankSubName}
</if>
<if test="searchVo.bankProvince != null">
AND a.BANK_PROVINCE = #{searchVo.bankProvince}
</if>
<if test="searchVo.bankCity != null">
AND a.BANK_CITY = #{searchVo.bankCity}
</if>
<if test="searchVo.isPersonTax != null and searchVo.isPersonTax.trim() != ''">
AND a.IS_PERSON_TAX = #{searchVo.isPersonTax}
</if>
<if test="searchVo.relaySalary != null">
AND a.RELAY_SALARY = #{searchVo.relaySalary}
</if>
<if test="searchVo.actualSalary != null">
AND a.ACTUAL_SALARY = #{searchVo.actualSalary}
</if>
<if test="searchVo.salaryTax != null">
AND a.SALARY_TAX = #{searchVo.salaryTax}
</if>
<if test="searchVo.relaySalaryUnit != null">
AND a.RELAY_SALARY_UNIT = #{searchVo.relaySalaryUnit}
</if>
<if test="searchVo.salaryTaxUnit != null">
AND a.SALARY_TAX_UNIT = #{searchVo.salaryTaxUnit}
</if>
</if>
</sql>
</mapper> </mapper>
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @ f1b5b3e8
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
<where> <where>
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
<!-- 薪资是否可查看 0 是 1否--> <!-- 薪资是否可查看 0 是 1否-->
and d.CAN_SEE= 0 and (d.CAN_SEE = 0 OR d.id is null)
<include refid="tSalaryStandard_where"/> <include refid="tSalaryStandard_where"/>
</where> </where>
ORDER BY a.CREATE_TIME desc ORDER BY a.CREATE_TIME desc
...@@ -325,15 +325,15 @@ ...@@ -325,15 +325,15 @@
FROM t_salary_standard a FROM t_salary_standard a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where> <where>
a.DELETE_FLAG = 0 AND d.CAN_SEE = 0 a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/> <include refid="where_export"/>
</where>
ORDER BY a.CREATE_TIME desc ORDER BY a.CREATE_TIME desc
<if test="searchVo != null"> <if test="searchVo != null">
<if test="searchVo.limitStart != null"> <if test="searchVo.limitStart != null">
limit #{searchVo.limitStart},#{searchVo.limitEnd} limit #{searchVo.limitStart},#{searchVo.limitEnd}
</if> </if>
</if> </if>
</where>
</select> </select>
<!--tSalaryStandard简单分页查询--> <!--tSalaryStandard简单分页查询-->
<select id="getSalaryStandardExportCount" resultType="java.lang.Integer"> <select id="getSalaryStandardExportCount" resultType="java.lang.Integer">
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
FROM t_salary_standard a FROM t_salary_standard a
LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
<where> <where>
a.DELETE_FLAG = 0 AND d.CAN_SEE = 0 a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
<include refid="where_export"/> <include refid="where_export"/>
</where> </where>
</select> </select>
......
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