Merge remote-tracking branch 'origin/lal' into dev-mobh

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -212,10 +212,10 @@ public class SalaryManagementController {
 	/**
 	/**
 	 * 获取薪资组信息
 	 * 获取薪资组信息
 	 */
 	 */
-	@GetMapping(value = "/paylist")
+	@GetMapping(value = "/paylist/{yemon}")
 	@ApiOperation(value = "获取薪资组信息", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "获取薪资组信息", httpMethod = "GET", notes = "接口发布说明")
-	public ResponseResult selectpaylist(@CurrentUser UserBean userBean) {
-		List<XcglAdminXzz> xcgladminxzz = new LambdaQueryChainWrapper<XcglAdminXzz>(xcgladminxzzmapper).eq(XcglAdminXzz::getQyid, userBean.getOrgCode()).list();
+	public ResponseResult selectpaylist(@CurrentUser UserBean userBean,@PathVariable String yemon) {
+		List<XcglAdminXzz> xcgladminxzz = new LambdaQueryChainWrapper<XcglAdminXzz>(xcgladminxzzmapper).eq(XcglAdminXzz::getQyid, userBean.getOrgCode()).eq(XcglAdminXzz::getMonthtime, yemon).list();
 		return new ResponseResult().success("获取薪资组信息成功", xcgladminxzz);
 		return new ResponseResult().success("获取薪资组信息成功", xcgladminxzz);
 	}
 	}
 	
 	
@@ -1477,12 +1477,18 @@ public class SalaryManagementController {
 	}
 	}
 	
 	
 	
 	
-	
+	/**
+	 *	 计算薪资
+	 * @param userBean
+	 * @param calcomtiondto
+	 * @return
+	 */
 	@PostMapping(value = "/salary_calculation")
 	@PostMapping(value = "/salary_calculation")
 	@ApiOperation(value = "计算薪资", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "计算薪资", httpMethod = "POST", notes = "接口发布说明")
 	public Result<Object> SalaryCalculation(@CurrentUser UserBean userBean, @RequestBody CalculatingCompensationDto calcomtiondto) {
 	public Result<Object> SalaryCalculation(@CurrentUser UserBean userBean, @RequestBody CalculatingCompensationDto calcomtiondto) {
 		
 		
 		//#1、计算个税   （薪资组id、薪资月份）
 		//#1、计算个税   （薪资组id、薪资月份）
+		
 		//查询出薪资组内成员
 		//查询出薪资组内成员
 		List<XcglAssoXzury> paygrlist = XcglAssoXzury.builder().build().selectList(new QueryWrapper<XcglAssoXzury>().lambda().eq(XcglAssoXzury::getXzzid, calcomtiondto.getPay_group_id()));
 		List<XcglAssoXzury> paygrlist = XcglAssoXzury.builder().build().selectList(new QueryWrapper<XcglAssoXzury>().lambda().eq(XcglAssoXzury::getXzzid, calcomtiondto.getPay_group_id()));
 		int[] noperincuser = new int[paygrlist.size()];//用来储存没有个税的用户id
 		int[] noperincuser = new int[paygrlist.size()];//用来储存没有个税的用户id
@@ -1495,7 +1501,7 @@ public class SalaryManagementController {
 				i++;
 				i++;
 			}
 			}
 		}
 		}
-		//循环计算没有
+		//循环计算当前薪资月没有个税的用户
 		for(int gsus : noperincuser) {
 		for(int gsus : noperincuser) {
 //			XcglAssoGsjsmx gsjs = XcglAssoGsjsmx.builder().build().
 //			XcglAssoGsjsmx gsjs = XcglAssoGsjsmx.builder().build().
 		}
 		}