专项扣除

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSpecialDeducationSum.java

@@ -81,14 +81,14 @@ public class TSpecialDeducationSum extends BaseEntity {
       * 所得期间起
       */
      @Length(max = 20, message = "所得期间起不能超过20个字符")
-     @ExcelAttribute(name = "所得期间起", maxLength = 20, isNotEmpty = true, isDate = true)
+     @ExcelAttribute(name = "所得期间起", maxLength = 20, isNotEmpty = true)
      @ExcelProperty(value = "所得期间起")
      private String createStart;
      /**
       * 所得期间止
       */
      @Length(max = 20, message = "所得期间止不能超过20个字符")
-     @ExcelAttribute(name = "所得期间止", maxLength = 20, isNotEmpty = true, isDate = true)
+     @ExcelAttribute(name = "所得期间止", maxLength = 20, isNotEmpty = true)
      @ExcelProperty(value = "所得期间止")
      private String createEnd;
      /**

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryConfigStandardController.java

 package com.yifu.cloud.plus.v1.yifu.salary.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -119,6 +120,11 @@ public class TSalaryConfigStandardController {
 		if (null == user || null == user.getId()) {
 			return R.failed(NO_USER);
 		}
+		long res = tSalaryConfigStandardService.count(Wrappers.<TSalaryConfigStandard>query().lambda()
+				.eq(TSalaryConfigStandard::getDbFiedName,tSalaryConfigStandard.getDbFiedName()));
+		if (res > 0){
+			return R.failed("已存在系统标准数据项");
+		}
 		// 填充个人代扣等java字段
 		this.setJavaFiedName(tSalaryConfigStandard);
 		tSalaryConfigStandard.setCreateBy(String.valueOf(user.getId()));
@@ -144,6 +150,12 @@ public class TSalaryConfigStandardController {
 		if (null == user || null == user.getId()) {
 			return R.failed(NO_USER);
 		}
+		long res = tSalaryConfigStandardService.count(Wrappers.<TSalaryConfigStandard>query().lambda()
+				.eq(TSalaryConfigStandard::getDbFiedName,tSalaryConfigStandard.getDbFiedName())
+				.ne(TSalaryConfigStandard::getId,tSalaryConfigStandard.getId()));
+		if (res > 0){
+			return R.failed("已存在系统标准数据项");
+		}
 		// 填充个人代扣等java字段
 		this.setJavaFiedName(tSalaryConfigStandard);
 		if (String.valueOf(user.getId()).equals(tSalaryConfigStandard.getCreateBy())) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSpecialDeducationSumController.java

@@ -76,7 +76,7 @@ public class TSpecialDeducationSumController {
 	@Operation(description = "新增(wxhr:tspecialdeducationsum_add)")
 	@PostMapping
 	@PreAuthorize("@pms.hasPermission('wxhr:tspecialdeducationsum_add')")
-	public R save(@Valid @RequestBody TSpecialDeducationSum tSpecialDeducationSum) {
+	public R<Boolean> save(@Valid @RequestBody TSpecialDeducationSum tSpecialDeducationSum) {
 		return new R<>(tSpecialDeducationSumService.save(tSpecialDeducationSum));
 	}
 
@@ -90,7 +90,7 @@ public class TSpecialDeducationSumController {
 	@SysLog("修改")
 	@PutMapping
 	@PreAuthorize("@pms.hasPermission('wxhr:tspecialdeducationsum_edit')")
-	public R update(@RequestBody TSpecialDeducationSum tSpecialDeducationSum) {
+	public R<Boolean> update(@RequestBody TSpecialDeducationSum tSpecialDeducationSum) {
 		return new R<>(tSpecialDeducationSumService.updateById(tSpecialDeducationSum));
 	}
 
@@ -104,7 +104,7 @@ public class TSpecialDeducationSumController {
 	@SysLog("删除")
 	@DeleteMapping("/{id}")
 	@PreAuthorize("@pms.hasPermission('wxhr:tspecialdeducationsum_del')")
-	public R removeById(@PathVariable String id) {
+	public R<Boolean> removeById(@PathVariable String id) {
 		return new R<>(tSpecialDeducationSumService.removeById(id));
 	}
 
@@ -151,7 +151,7 @@ public class TSpecialDeducationSumController {
 	@Operation(description = "删除本月全部专项扣除")
 	@SysLog("删除本月全部专项扣除")
 	@PostMapping("/doDeleteTSumSpecialDeducationAll")
-	public R doDeleteTSumSpecialDeducationAll(String yearMonth, String declareTitle) {
+	public R<Boolean> doDeleteTSumSpecialDeducationAll(String yearMonth, String declareTitle) {
 		if (Common.isEmpty(yearMonth)) {
 			SimpleDateFormat df = new SimpleDateFormat("yyyyMM");
 			yearMonth = df.format(new Date());
@@ -163,7 +163,7 @@ public class TSpecialDeducationSumController {
 		if (num == 0) {
 			return R.failed("当前条件查询无数据，未删除");
 		} else {
-			return new R<>("已删除" + num + "条数据");
+			return R.ok(null,"已删除" + num + "条数据");
 		}
 	}
 
@@ -177,7 +177,7 @@ public class TSpecialDeducationSumController {
 	@Operation(description = "导出专项扣除")
 	@SysLog("导出专项扣除")
 	@GetMapping("/doExportSpecialDeducationSum")
-	public R doExportSpecialDeducationSum(TSpecialDeducationSum tSpecialDeducationSum) {
+	public R<List<TSpecialDeducationSum>> doExportSpecialDeducationSum(TSpecialDeducationSum tSpecialDeducationSum) {
 		if (Common.isEmpty(tSpecialDeducationSum.getCreateMonth())) {
 			String nowMonth = DateUtil.addMonth(0);  //本月
 			tSpecialDeducationSum.setCreateMonth(nowMonth);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSpecialDeducationSumServiceImpl.java

@@ -114,7 +114,9 @@ public class TSpecialDeducationSumServiceImpl extends ServiceImpl<TSpecialDeduca
 				  return R.ok(errorMessages);
 			  }
                String nowYearMonth = DateUtil.getCurrentDateString("yyyyMM");
-               String yearMonth = DateUtil.getYearMonth(sdsList.get(0).getCreateStart());
+               String yearMonth = DateUtil.getYearMonth(sdsList.get(0).getCreateStart()
+					   .replace("/","")
+					   .replace("-",""));
                if (Common.isNotNull(yearMonth)) {
                     if (!yearMonth.equals(nowYearMonth)) {
                          return R.failed("所得期间-不是当前年月:" + nowYearMonth + "，不允许导入");