消息提醒优化

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

@@ -114,7 +114,7 @@ public class SysMessageSalaryController {
 	@Operation(description = "最低工资提醒导出")
 	@PostMapping("/export")
 	public void export(HttpServletResponse response,
-					   SysMessageSalarySearchVo searchVo) {
+					   @RequestBody SysMessageSalarySearchVo searchVo) {
 		sysMessageSalaryService.listExport(response,searchVo);
 	}
 

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

@@ -128,7 +128,7 @@ public class THaveSalaryNosocialController {
 	@Operation(description = "有工资无社保消息提醒导出")
 	@PostMapping("/export")
 	public void export(HttpServletResponse response,
-					   THaveSalaryNosocialSearchVo searchVo) {
+					   @RequestBody THaveSalaryNosocialSearchVo searchVo) {
 		tHaveSalaryNosocialService.listExport(response,searchVo);
 	}
 
@@ -159,7 +159,7 @@ public class THaveSalaryNosocialController {
     @Inner
     @PostMapping("/inner/generate")
     public void generate() {
-        String settleMonth = DateUtil.addMonth(-1);
+        String settleMonth = DateUtil.addMonth(0);
         tHaveSalaryNosocialService.generate(settleMonth);
     }
 

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

@@ -150,12 +150,12 @@ public class SysMessageSalaryServiceImpl extends ServiceImpl<SysMessageSalaryMap
 	**/
 	@Override
 	public void listExport(HttpServletResponse response, SysMessageSalarySearchVo searchVo) {
-		String fileName = "最低工资提醒查询批量导出" + DateUtil.getThisTime() + ".xlsx";
+		String fileName = "最低工资提醒批量导出" + DateUtil.getThisTime() + ".xlsx";
 		//获取要导出的列表
 		List<SysMessageSalaryExportVo> list = new ArrayList<>();
 		// TODO
 		List<String> settleDomainIds =null;
-		List<String> ids = null;
+		List<String> ids = Common.getList(searchVo.getIds());
 		String sql = null;
 		int count = noPageCountDiy(searchVo,settleDomainIds,ids,sql);
 		ServletOutputStream out = null;

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

@@ -120,7 +120,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
         this.remove(Wrappers.<THaveSalaryNosocial>query().lambda().eq(THaveSalaryNosocial::getSettleMonth,settleMonth));
         List<THaveSalaryNosocial> haveSalaryNosocialList = salaryAccountService.getLastMonthTHaveSalaryNosocial(settleMonth);
         if(!Common.isNotEmpty(haveSalaryNosocialList)){
-            log.error("获取上月有社保无工资数据为空");
+            log.error("获取有社保无工资数据为空");
             return;
         }
         //去缴费库查询查询这些人社保是否存在
@@ -191,7 +191,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
 	**/
 	@Override
 	public void listExport(HttpServletResponse response, THaveSalaryNosocialSearchVo searchVo) {
-		String fileName = "有工资无社保查询批量导出" + DateUtil.getThisTime() + ".xlsx";
+		String fileName = "有工资无社保批量导出" + DateUtil.getThisTime() + ".xlsx";
 		//获取要导出的列表
 		List<THaveSalaryNoSocialExportVo> list = new ArrayList<>();
 		// TODO

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

@@ -192,8 +192,8 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 	@Override
 	public List<THaveSalaryNosocial> getLastMonthTHaveSalaryNosocial(String month) {
 		return baseMapper.getLastMonthTHaveSalaryNosocial(month,
-				DateUtil.getYearAndMonth(month,CommonConstants.ONE_INT),
-				DateUtil.getYearAndMonth(month,CommonConstants.TWO_INT));
+				DateUtil.getYearAndMonth(month,-CommonConstants.ONE_INT),
+				DateUtil.getYearAndMonth(month,-CommonConstants.TWO_INT));
 	}
 
 	@Override

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

@@ -178,9 +178,9 @@
             province,
             city,
             town,
-            DEPART_ID,
-            DEPART_NAME,
-            DEPART_NO,
+			DEPT_ID,
+			DEPT_NAME,
+			DEPT_NO,
             0 as TYPE
             FROM
                 (
@@ -189,10 +189,10 @@
                         a.EMP_ID employee_id,
                         a.EMP_IDCARD employee_idnum,
                         a.EMP_NAME employee_name,
-                        s.DEPART_ID,
-                        s.DEPART_NAME,
-                        s.DEPART_NO,
-                        a.SALARY_DATE salary_month,
+						s.DEPT_ID,
+						s.DEPT_NAME,
+						s.DEPT_NO,
+                        a.SALARY_MONTH salary_month,
                         a.SETTLEMENT_MONTH settle_month,
                         sum(i.SALARY_MONEY) AS actual_salary,
                         sum(l.SALARY_MONEY) AS relay_Salary,
@@ -212,7 +212,7 @@
                     a.DELETE_FLAG = 0
                     and	s.SEND_MONTH = #{settleMonth}
                     AND s.STATUS IN (3, 4)
-                    GROUP BY a.EMP_IDCARD,a.SALARY_DATE
+                    GROUP BY a.EMP_IDCARD,a.SALARY_MONTH
                 ) b
             WHERE b.salary_base > b.actual_salary
     </select>

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

@@ -11,7 +11,7 @@
         <result property="customerName" column="CUSTOMER_NAME"/>
         <result property="settlementOrganName" column="SETTLEMENT_ORGAN_NAME"/>
         <result property="settlementOrganNo" column="SETTLEMENT_ORGAN_NO"/>
-		<result property="feedBack" column="FEEDBACK"/>
+		<result property="feedBack" column="FEED_BACK"/>
 		<result property="reasonType" column="REASON_TYPE"/>
         <result property="month" column="month"/>
     </resultMap>
@@ -23,7 +23,7 @@
 		<result property="month" column="month"/>
 		<result property="relaySalary" column="RELAY_SALARY"/>
 		<result property="createName" column="CREATE_NAME"/>
-		<result property="feedBack" column="FEEDBACK"/>
+		<result property="feedBack" column="FEED_BACK"/>
 
 	</resultMap>
     <sql id="Base_Column_List">
@@ -39,7 +39,7 @@
                   a.month,
                   a.SETTLE_MONTH,
                   a.relay_salary,
-                  a.FEEDBACK,
+                  a.FEED_BACK,
 				  a.CREATE_NAME,
 				 a.REASON_TYPE
          </sql>

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

@@ -338,7 +338,7 @@
 
 				 where
 					 a.DELETE_FLAG = 0
-				   and s.send_month in ( #{month} , #{month2} , #{month3})
+				   and a.send_month in ( #{month} , #{month2} , #{month3})
 				   AND s.STATUS IN (3, 4)
 				 GROUP BY a.EMP_IDCARD, a.SALARY_MONTH limit 10
 			 ) a