Commit cac9e50a authored by hongguangwu's avatar hongguangwu

MVP1.6.2-工资原表识别-优化

parent 7f780f22
...@@ -37,4 +37,6 @@ public class SalaryConstants { ...@@ -37,4 +37,6 @@ public class SalaryConstants {
public static final String PDEDUCTION_JAVA = "pdeduction"; public static final String PDEDUCTION_JAVA = "pdeduction";
//单位代扣 //单位代扣
public static final String UDEDUCTION_JAVA = "udeduction"; public static final String UDEDUCTION_JAVA = "udeduction";
// 项目报销的 数据来源:0企业微信;1固资划转
public static final Integer[] DATA_SOURCE = {0,1};
} }
...@@ -73,4 +73,11 @@ public class TSalaryStandardOriginalDetail { ...@@ -73,4 +73,11 @@ public class TSalaryStandardOriginalDetail {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "公式标志:MAIN主;ADD加;REDUCE减") @ExcelProperty(value = "公式标志:MAIN主;ADD加;REDUCE减")
private String flag; private String flag;
/**
* 公式顺序编号(前端使用)
*/
@ExcelAttribute(name = "公式顺序编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("公式顺序编号")
private Integer formulaNo;
} }
...@@ -32,7 +32,9 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal; ...@@ -32,7 +32,9 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginal;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginalDetail; import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardOriginalDetail;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalDetailService; import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalDetailService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalService; import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardOriginalService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.*; import com.yifu.cloud.plus.v1.yifu.salary.vo.ExcelSheetVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryOriginalVo;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadOriginalParamVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -73,12 +75,22 @@ public class TSalaryStandardOriginalController { ...@@ -73,12 +75,22 @@ public class TSalaryStandardOriginalController {
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/page") @GetMapping("/page")
public R<IPage<TSalaryStandardOriginal>> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal) { public R<IPage<TSalaryStandardOriginal>> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal) {
tSalaryStandardOriginal.setDeleteFlag(CommonConstants.ZERO_INT);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tSalaryStandardOriginal); menuUtil.setAuthSql(user, tSalaryStandardOriginal);
return new R<>(tSalaryStandardOriginalService.getTSalaryStandardOriginalPage(page, tSalaryStandardOriginal)); return new R<>(tSalaryStandardOriginalService.getTSalaryStandardOriginalPage(page, tSalaryStandardOriginal));
} }
/**
* 导入工资时的获取识别配置列表
*/
@Operation(description = "导入工资时的获取识别配置列表")
@GetMapping("/getTSalaryStandardOriginalList")
public R<List<TSalaryStandardOriginal>> getTSalaryStandardOriginalList(TSalaryStandardOriginal tSalaryStandardOriginal) {
YifuUser user = SecurityUtils.getUser();
menuUtil.setAuthSql(user, tSalaryStandardOriginal);
return new R<>(tSalaryStandardOriginalService.getTSalaryStandardOriginalList(tSalaryStandardOriginal));
}
/** /**
* 通过id查询薪资原表识别 * 通过id查询薪资原表识别
* *
...@@ -210,7 +222,7 @@ public class TSalaryStandardOriginalController { ...@@ -210,7 +222,7 @@ public class TSalaryStandardOriginalController {
@SysLog("获取表头等信息") @SysLog("获取表头等信息")
@Operation(description = "获取表头等信息") @Operation(description = "获取表头等信息")
@PostMapping("/getExcelHeader") @PostMapping("/getExcelHeader")
public R<ExcelSheetVo> getExcelHeader(@RequestBody MultipartFile file,@RequestParam String sheetName) { public R<ExcelSheetVo> getExcelHeader(@RequestBody MultipartFile file, @RequestParam String sheetName) {
return tSalaryStandardOriginalService.getExcelHeader(file, sheetName); return tSalaryStandardOriginalService.getExcelHeader(file, sheetName);
} }
......
...@@ -39,6 +39,11 @@ public interface TSalaryStandardOriginalMapper extends BaseMapper<TSalaryStandar ...@@ -39,6 +39,11 @@ public interface TSalaryStandardOriginalMapper extends BaseMapper<TSalaryStandar
*/ */
IPage<TSalaryStandardOriginal> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page IPage<TSalaryStandardOriginal> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page
, @Param("tSalaryStandardOriginal") TSalaryStandardOriginal tSalaryStandardOriginal); , @Param("tSalaryStandardOriginal") TSalaryStandardOriginal tSalaryStandardOriginal);
/**
* 薪资原表识别导入-分页
*/
List<TSalaryStandardOriginal> getTSalaryStandardOriginalList(
@Param("tSalaryStandardOriginal") TSalaryStandardOriginal tSalaryStandardOriginal);
/** /**
* 特殊身份证允许识别为数据行 * 特殊身份证允许识别为数据行
......
...@@ -44,6 +44,8 @@ public interface TSalaryStandardOriginalService extends IService<TSalaryStandard ...@@ -44,6 +44,8 @@ public interface TSalaryStandardOriginalService extends IService<TSalaryStandard
**/ **/
IPage<TSalaryStandardOriginal> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal); IPage<TSalaryStandardOriginal> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal);
List<TSalaryStandardOriginal> getTSalaryStandardOriginalList(TSalaryStandardOriginal tSalaryStandardOriginal);
/** /**
* @param file * @param file
* @Description: 识别表头主类 * @Description: 识别表头主类
......
...@@ -80,6 +80,16 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand ...@@ -80,6 +80,16 @@ public class TSalaryStandardOriginalServiceImpl extends ServiceImpl<TSalaryStand
public IPage<TSalaryStandardOriginal> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal) { public IPage<TSalaryStandardOriginal> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal) {
return baseMapper.getTSalaryStandardOriginalPage(page, tSalaryStandardOriginal); return baseMapper.getTSalaryStandardOriginalPage(page, tSalaryStandardOriginal);
} }
/**
* @Description: 分页查询
* @Author: hgw
* @Date: 2024/4/2 17:19
* @return:
**/
@Override
public List<TSalaryStandardOriginal> getTSalaryStandardOriginalList(TSalaryStandardOriginal tSalaryStandardOriginal) {
return baseMapper.getTSalaryStandardOriginalList(tSalaryStandardOriginal);
}
/** /**
* @param file * @param file
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<result property="excelName" column="EXCEL_NAME"/> <result property="excelName" column="EXCEL_NAME"/>
<result property="modelName" column="MODEL_NAME"/> <result property="modelName" column="MODEL_NAME"/>
<result property="flag" column="FLAG"/> <result property="flag" column="FLAG"/>
<result property="formulaNo" column="FORMULA_NO"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -37,7 +38,8 @@ ...@@ -37,7 +38,8 @@
a.COLUMN_NO, a.COLUMN_NO,
a.EXCEL_NAME, a.EXCEL_NAME,
a.MODEL_NAME, a.MODEL_NAME,
a.FLAG a.FLAG,
a.FORMULA_NO
</sql> </sql>
<sql id="TSalaryStandardOriginalDetail_where"> <sql id="TSalaryStandardOriginalDetail_where">
<if test="tSalaryStandardOriginalDetail != null"> <if test="tSalaryStandardOriginalDetail != null">
......
...@@ -109,6 +109,17 @@ ...@@ -109,6 +109,17 @@
</where> </where>
ORDER BY a.CREATE_TIME desc ORDER BY a.CREATE_TIME desc
</select> </select>
<!--导入工资时的获取识别配置列表-->
<select id="getTSalaryStandardOriginalList" resultMap="TSalaryStandardOriginalMap">
SELECT
<include refid="Base_Column_List"/>
FROM
t_salary_standard_original a
<where> a.DELETE_FLAG = 0
<include refid="TSalaryStandardOriginal_where"/>
</where>
ORDER BY a.CREATE_TIME asc
</select>
<!-- 特殊身份证允许识别为数据行 --> <!-- 特殊身份证允许识别为数据行 -->
<select id="getSpecialIdCardList" resultType="java.lang.String"> <select id="getSpecialIdCardList" resultType="java.lang.String">
......
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