申报修改

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

@@ -46,5 +46,5 @@ public interface TStatisticsDeclarerMapper extends BaseMapper<TStatisticsDeclare
 	 * @Description: 统计
 	 * @return:
 	 **/
-	List<TStatisticsDeclarer> doStatisticsTaxDeclarer(@Param("nowMonth") String nowMonth, @Param("lastYear") String lastYear);
+	List<TStatisticsDeclarer> doStatisticsTaxDeclarer(@Param("nowMonth") String nowMonth, @Param("lastMonth") String lastYear);
 }

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

@@ -173,8 +173,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
 			return R.failed("上月数据已生成，不可重复生成！");
 		} else {
 			String lastMonth =  DateUtil.addMonth(-1);  //上月
-			String lastYear = lastMonth.substring(0,4);
-			List<TStatisticsDeclarer> stdvoList = baseMapper.doStatisticsTaxDeclarer(nowMonth,lastYear);
+			List<TStatisticsDeclarer> stdvoList = baseMapper.doStatisticsTaxDeclarer(nowMonth,lastMonth);
 			for (TStatisticsDeclarer declarer : stdvoList) {
 				this.save(declarer);
 			}

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

@@ -100,7 +100,7 @@
 			if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) OCCUPATION_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}%'
+		where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH = #{lastMonth}
 		GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,DECLARE_UNIT,a.SETTLEMENT_MONTH
 	</select>
 </mapper>