员工补贴、包活等查询条件更正

ruoyi-admin/src/main/resources/application-hs.yml

@@ -49,9 +49,10 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3307/pay?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+          #url: jdbc:mysql://localhost:3307/pay?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://172.16.9.9:3306/pay?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
           username: root
-          password: hs123456
+          password: ruanfa
         # 从库数据源
 #        slave:
 #          lazy: true
@@ -102,7 +103,8 @@ spring:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: 172.16.9.9
+    #host: localhost
     # 端口，默认为6379
     port: 6379
     # 数据库索引

ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java

@@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.apache.poi.hpsf.Decimal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -160,15 +161,17 @@ public class PayButieEmplyeeController extends BaseController {
         }
         PayEmployeeInfoBo employeeInfo = new PayEmployeeInfoBo();
         employeeInfo.setId(bo.getEmployeeId());
+        employeeInfo.setName(bo.getEmpName());
         employeeInfo.setTenantId(bo.getTenantId());
         TableDataInfo<PayEmployeeInfoVo> payEmployeeTableDataInfo = employeeInfoService.queryPageList(employeeInfo, pageQuery);
         if(payEmployeeTableDataInfo.getRows()!=null&&payEmployeeTableDataInfo.getRows().size()>0){
-            butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date);
+            butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date,bo.getMoney());
         }
         return TableDataInfo.build(butieSummaryVos);
     }
 
-    private List<ButieSummaryVo> buildEmployeeInfo(List<PayEmployeeInfoVo> list, String date) {
+    private List<ButieSummaryVo> buildEmployeeInfo(List<PayEmployeeInfoVo> list, String date,
+                                                   BigDecimal qmoney) {
         PayButieBo pb = new PayButieBo();
         pb.setTenantId(list.get(0).getTenantId());
         List<PayButieVo> sgrButies = butieService.queryList(pb);
@@ -184,6 +187,7 @@ public class PayButieEmplyeeController extends BaseController {
                 query.setEmployeeId(emp.getId());
                 query.setButieId(butie.getId());
                 query.setDate(date);
+                query.setMoney(qmoney);
                 List<PayButieEmplyeeVo> butieEmplyeeVos = iPayButieEmplyeeService.queryList(query);
                 if(butieEmplyeeVos!=null&&butieEmplyeeVos.size()>0){
                     money=butieEmplyeeVos.get(0).getMoney();

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/PayWorkOrderBaohuo.java

@@ -97,6 +97,7 @@ public class PayWorkOrderBaohuo extends BaseEntity {
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date instorageTime;
+
     /**
      * 入库人员
      */

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayButieEmplyeeBo.java

@@ -45,6 +45,10 @@ public class PayButieEmplyeeBo extends BaseEntity {
      */
     @NotNull(message = "员工id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long employeeId;
+    /**
+     * 员工姓名
+     */
+    private String empName;
 
     /**
      * 补贴扣减金额

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java

@@ -139,6 +139,11 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
     @NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date instorageTime;
 
+    //入库月份
+    @JsonFormat(pattern = "yyyy-MM")
+    @DateTimeFormat(pattern = "yyyy-MM")
+    private Date instorageDate;
+
     /**
      * 入库人员
      */

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayDayWorkHoursServiceImpl.java

@@ -86,7 +86,7 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<PayDayWorkHoursBo> lqw =  Wrappers.query();;
         lqw.eq(bo.getTenantId() != null, "d.tenant_id", bo.getTenantId());
-        lqw.eq(bo.getDeptId() != null, "dept_id", bo.getDeptId());
+        lqw.eq(bo.getDeptId() != null, "d.dept_id", bo.getDeptId());
         lqw.like(StringUtils.isNotBlank(bo.getDeptName()), "dept_name", bo.getDeptName());
         lqw.eq(bo.getEmployeeId() != null, "employee_id", bo.getEmployeeId());
         lqw.like(StringUtils.isNotBlank(bo.getEmpName()), "emp_name", bo.getEmpName());

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PaySalaryReportServiceImpl.java

@@ -114,6 +114,7 @@ public class PaySalaryReportServiceImpl implements IPaySalaryReportService {
         lqw.eq(StringUtils.isNotBlank(bo.getYear()), PaySalaryReport::getYear, bo.getYear());
         lqw.eq(StringUtils.isNotBlank(bo.getMonth()), PaySalaryReport::getMonth, bo.getMonth());
         lqw.eq(bo.getDeptId() != null, PaySalaryReport::getDeptId, bo.getDeptId());
+        lqw.eq(bo.getDeptName() != null, PaySalaryReport::getDeptName, bo.getDeptName());
         lqw.like(StringUtils.isNotBlank(bo.getDeptName()), PaySalaryReport::getDeptName, bo.getDeptName());
         lqw.eq(bo.getEmployeeId() != null, PaySalaryReport::getEmployeeId, bo.getEmployeeId());
         lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), PaySalaryReport::getEmployeeName, bo.getEmployeeName());

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayWorkOrderBaohuoServiceImpl.java

@@ -117,6 +117,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
     private LambdaQueryWrapper<PayWorkOrderBaohuo> buildQueryWrapper(PayWorkOrderBaohuoBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PayWorkOrderBaohuo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getId() != null, PayWorkOrderBaohuo::getId, bo.getId());
         lqw.eq(bo.getTenantId() != null, PayWorkOrderBaohuo::getTenantId, bo.getTenantId());
         lqw.eq(StringUtils.isNotBlank(bo.getArchiveId()), PayWorkOrderBaohuo::getArchiveId, bo.getArchiveId());
         lqw.eq(bo.getProductId() != null, PayWorkOrderBaohuo::getProductId, bo.getProductId());
@@ -133,6 +134,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
         lqw.like(StringUtils.isNotBlank(bo.getQualityName()), PayWorkOrderBaohuo::getQualityName, bo.getQualityName());
         lqw.eq(StringUtils.isNotBlank(bo.getQualityRemark()), PayWorkOrderBaohuo::getQualityRemark, bo.getQualityRemark());
         lqw.eq(bo.getInstorageTime() != null, PayWorkOrderBaohuo::getInstorageTime, bo.getInstorageTime());
+        lqw.apply(bo.getInstorageDate()!= null, "DATE_FORMAT (instorage_time,'%Y-%m')={0}",DateUtil.format(bo.getInstorageDate(),"yyyy-MM"));
         lqw.like(StringUtils.isNotBlank(bo.getInstorageName()), PayWorkOrderBaohuo::getInstorageName, bo.getInstorageName());
         lqw.eq(bo.getInstorageNum() != null, PayWorkOrderBaohuo::getInstorageNum, bo.getInstorageNum());
         lqw.like(StringUtils.isNotBlank(bo.getManagerName()), PayWorkOrderBaohuo::getManagerName, bo.getManagerName());