申报，稿酬，劳务费接口修改

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

@@ -75,13 +75,6 @@ public class TStatisticsLabor {
 	@Length(max = 32, message = "身份证号不能超过32个字符")
 	@ExcelProperty("身份证号")
 	private String empIdcard;
-	/**
-	 * 工号
-	 */
-	@ExcelAttribute(name = "工号", maxLength = 32)
-	@Length(max = 32, message = "工号不能超过32个字符")
-	@ExcelProperty("工号")
-	private String workNo;
 	/**
 	 * 证件类型
 	 */

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

@@ -94,12 +94,5 @@ public class TStatisticsRemuneration {
 	@ExcelAttribute(name = "个税")
 	@ExcelProperty("个税")
 	private BigDecimal personalTax;
-	/**
-	 * 工号
-	 */
-	@ExcelAttribute(name = "工号", maxLength = 32)
-	@Length(max = 32, message = "工号不能超过32个字符")
-	@ExcelProperty("工号")
-	private String workNo;
 
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsLaborVo.java

@@ -81,14 +81,6 @@ public class TStatisticsLaborVo extends RowIndex implements Serializable {
 	@Schema(description = "身份证号")
 	@ExcelProperty("身份证号")
 	private String empIdcard;
-	/**
-	 * 工号
-	 */
-	@Length(max = 32, message = "工号 不能超过32 个字符")
-	@ExcelAttribute(name = "工号", maxLength = 32)
-	@Schema(description = "工号")
-	@ExcelProperty("工号")
-	private String workNo;
 	/**
 	 * 证件类型
 	 */

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsRemunerationVo.java

@@ -103,13 +103,5 @@ public class TStatisticsRemunerationVo extends RowIndex implements Serializable
 	@Schema(description = "个税")
 	@ExcelProperty("个税")
 	private BigDecimal personalTax;
-	/**
-	 * 工号
-	 */
-	@Length(max = 32, message = "工号 不能超过32 个字符")
-	@ExcelAttribute(name = "工号", maxLength = 32)
-	@Schema(description = "工号")
-	@ExcelProperty("工号")
-	private String workNo;
 
 }

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

@@ -32,7 +32,6 @@ public class SalaryUploadController {
 	 * @param settleDepart 结算主体id
 	 * @param configId     配置方案id
 	 * @param salaryType   报表类型id
-	 * @param repeatFlag   默认 0：不允许重复导入已存在系统内的数据；1：允许重复导入
 	 * @Description:
 	 * @Author: hgw
 	 * @Date: 2019/9/11 15:21
@@ -41,7 +40,7 @@ public class SalaryUploadController {
 	@Operation(description = "上传：jsonString：表格json；settleDepart：结算主体id；configId：工资配置结算月等信息的id；salaryType：工资类型")
 	@SysLog("上传薪资表")
 	@PostMapping("/upload")
-	public R upload(@RequestBody String jsonString, @RequestParam String settleDepart, @RequestParam String configId
+	public R upload(@RequestBody String jsonString, @RequestParam String settleDepart, @RequestParam(required = false) String configId
 			, @RequestParam String salaryType) {
 		return salaryUploadService.salaryUpload(jsonString, settleDepart, configId, salaryType);
 	}

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsLaborService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborSearchVo;
@@ -36,7 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * 本期劳务费申报表
  *
- * @author hgw
+ * @author huyc
  * @date 2022-08-05 11:40:14
  */
 @RestController
@@ -90,7 +91,7 @@ public class TStatisticsLaborController {
 	/**
 	 * 本期劳务费申报表 批量导出
 	 *
-	 * @author hgw
+	 * @author huyc
 	 * @date 2022-08-05 11:40:14
 	 **/
 	@Operation(description = "导出本期劳务费申报表 hasPermission('salary_tstatisticslabor-export')")
@@ -113,4 +114,18 @@ public class TStatisticsLaborController {
 	public R batchDelete(@RequestParam String declareMonth){
 		return tStatisticsLaborService.batchDelete(declareMonth);
 	}
+
+	/**
+	 * @param
+	 * @Description: 生成本期劳务费
+	 * @Author: huyc
+	 * @Date: 2022-08-17 18:17:48
+	 * @return: com.yifu.cloud.v1.common.core.util.R
+	 **/
+	@Inner
+	@Operation(description = "生成本期劳务费")
+	@PostMapping("/inner/doStatisticsLabor")
+	public R doStatisticsLabor() {
+		return tStatisticsLaborService.doStatisticsLabor();
+	}
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsLaborMapper.java

@@ -23,6 +23,9 @@ import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 本期劳务费申报表
  *
@@ -37,4 +40,11 @@ public interface TStatisticsLaborMapper extends BaseMapper<TStatisticsLabor> {
      * @return
      */
     IPage<TStatisticsLabor> getTStatisticsLaborPage(Page<TStatisticsLabor> page, @Param("tStatisticsLabor") TStatisticsLabor tStatisticsLabor);
+
+	/**
+	 * @param
+	 * @Description: 统计
+	 * @return:
+	 **/
+	List<TStatisticsLabor> doStatisticsLabor(@Param("nowMonth") String nowMonth, @Param("lastYear") String lastYear);
 }

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

@@ -50,9 +50,15 @@ public interface TStatisticsLaborService extends IService<TStatisticsLabor> {
     List<TStatisticsLabor> noPageDiy(TStatisticsLaborSearchVo searchVo);
 
 	/**
-	 * 批量删除本期稿酬申报表
+	 * 批量删除本期劳务费申报表
 	 * @param declareMonth 申报月份
 	 * @return
 	 */
 	R batchDelete(String declareMonth);
+
+	/**	生成本期劳务费
+	 * @param
+	 * @return
+	 **/
+	R doStatisticsLabor();
 }

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

@@ -25,6 +25,7 @@ import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
 import com.alibaba.excel.util.ListUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -241,6 +242,27 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
 		return null;
 	}
 
+	@Override
+	public R doStatisticsLabor() {
+		String nowMonth = DateUtil.addMonth(0);  //本月
+		TStatisticsLabor std = new TStatisticsLabor();
+		std.setDeclareMonth(nowMonth);
+		QueryWrapper<TStatisticsLabor> queryWrapperSs = new QueryWrapper<>();
+		queryWrapperSs.setEntity(std);
+		long num = this.count(queryWrapperSs);
+		if (num > 0) {
+			return R.failed("上月数据已生成，不可重复生成！");
+		} else {
+			String lastMonth =  DateUtil.addMonth(-1);  //上月
+			String lastYear = lastMonth.substring(0,4);
+			List<TStatisticsLabor> stdvoList = baseMapper.doStatisticsLabor(nowMonth,lastYear);
+			for (TStatisticsLabor declarer : stdvoList) {
+				this.save(declarer);
+			}
+			return R.ok();
+		}
+	}
+
 	private void importTStatisticsLabor(List<TStatisticsLaborVo> excelVOList, List<ErrorMessage> errorMessageList) {
 		// 个性化校验逻辑
 		ErrorMessage errorMsg;

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -296,9 +296,11 @@ public class SalaryAccountUtil implements Serializable {
 					entity.setIsRepeat(CommonConstants.ZERO_INT);
 					if (relaySalary != null) {
 						relaySalary = relaySalary.setScale(2, BigDecimal.ROUND_HALF_UP);
-						if (checkMap.get(entity.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + DateUtil.addMonth(configSalary.getSalaryMonth())
-								+ CommonConstants.DOWN_LINE_STRING + salaryType + CommonConstants.DOWN_LINE_STRING + relaySalary) != null) {
-							entity.setIsRepeat(CommonConstants.ONE_INT);
+						if (checkMap.size() > CommonConstants.ZERO_INT) {
+							if (checkMap.get(entity.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + DateUtil.addMonth(configSalary.getSalaryMonth())
+									+ CommonConstants.DOWN_LINE_STRING + salaryType + CommonConstants.DOWN_LINE_STRING + relaySalary) != null) {
+								entity.setIsRepeat(CommonConstants.ONE_INT);
+							}
 						}
 						if (new BigDecimal("3500").compareTo(relaySalary) == CommonConstants.ZERO_INT
 								|| new BigDecimal("5000").compareTo(relaySalary) == CommonConstants.ZERO_INT) {

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml

@@ -29,7 +29,6 @@
     <result property="declareMonth" column="DECLARE_MONTH"/>
     <result property="empName" column="EMP_NAME"/>
     <result property="empIdcard" column="EMP_IDCARD"/>
-    <result property="workNo" column="WORK_NO"/>
     <result property="cardType" column="CARD_TYPE"/>
     <result property="income" column="INCOME"/>
     <result property="personalTax" column="PERSONAL_TAX"/>
@@ -41,7 +40,6 @@
                 a.DECLARE_MONTH,
                 a.EMP_NAME,
                 a.EMP_IDCARD,
-                a.WORK_NO,
                 a.CARD_TYPE,
                 a.INCOME,
                 a.PERSONAL_TAX,
@@ -64,9 +62,6 @@
                     <if test="tStatisticsLabor.empIdcard != null and tStatisticsLabor.empIdcard.trim() != ''">
                         AND a.EMP_IDCARD = #{tStatisticsLabor.empIdcard}
                     </if>
-                    <if test="tStatisticsLabor.workNo != null and tStatisticsLabor.workNo.trim() != ''">
-                        AND a.WORK_NO = #{tStatisticsLabor.workNo}
-                    </if>
                     <if test="tStatisticsLabor.cardType != null and tStatisticsLabor.cardType.trim() != ''">
                         AND a.CARD_TYPE = #{tStatisticsLabor.cardType}
                     </if>
@@ -93,4 +88,15 @@
 		group by a.EMP_IDCARD,a.DECLARE_MONTH,a.EMP_NAME
 		order by a.DECLARE_MONTH desc
     </select>
+
+	<!--统计-->
+	<select id="doStatisticsLabor" resultMap="tStatisticsLaborMap">
+		select
+			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.SALARY_TAX PERSONAL_TAX,a.ACTUAL_SALARY INCOME,
+			b.UNIT_NAME DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
+		from t_salary_account a
+				 left join t_salary_employee b on b.id = a.EMP_ID
+		where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH like '${lastYear}%'
+		GROUP BY a.EMP_IDCARD
+	</select>
 </mapper>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml

@@ -32,7 +32,6 @@
     <result property="cardType" column="CARD_TYPE"/>
     <result property="income" column="INCOME"/>
     <result property="personalTax" column="PERSONAL_TAX"/>
-    <result property="workNo" column="WORK_NO"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -42,8 +41,7 @@
                 a.EMP_IDCARD,
                 a.CARD_TYPE,
                 a.INCOME,
-                a.PERSONAL_TAX,
-                a.WORK_NO
+                a.PERSONAL_TAX
     </sql>
     <sql id="tStatisticsRemuneration_where">
         <if test="tStatisticsRemuneration != null">
@@ -71,9 +69,6 @@
                     <if test="tStatisticsRemuneration.personalTax != null">
                         AND a.PERSONAL_TAX = #{tStatisticsRemuneration.personalTax}
                     </if>
-                    <if test="tStatisticsRemuneration.workNo != null and tStatisticsRemuneration.workNo.trim() != ''">
-                        AND a.WORK_NO = #{tStatisticsRemuneration.workNo}
-                    </if>
         </if>
     </sql>
     <!--tStatisticsRemuneration简单分页查询-->