包活工单接口修改

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.pay.domain.vo.ExportBaohuoVo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;

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

@@ -19,6 +19,10 @@ public class PayDayWorkHoursQuery extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 租户id
+     */
+    private Long tenantId;
     /**
      * 员工部门id
      */
@@ -152,6 +156,14 @@ public class PayDayWorkHoursQuery extends BaseEntity {
         this.dwHoursContrasts = dwHoursContrasts;
     }
 
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-pay/src/main/java/com/ruoyi/pay/domain/vo/ExportBaohuoVo.java

@@ -0,0 +1,179 @@
+package com.ruoyi.pay.domain.vo;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ExportBaohuoVo {
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ExcelProperty(value = "日期")
+    private Date instorageTime;
+
+    /** 包活工单名称 */
+    @ExcelProperty(value = "工单名称")
+    private String name;
+
+    /** 包活工单ID */
+    @ExcelProperty(value = "工单ID")
+    private Long woId;
+
+    /** 产品名称 */
+    @ExcelProperty(value = "产品名称")
+    private String productName;
+
+    /** 工作内容 */
+    @ExcelProperty(value = "工作内容")
+    private String content;
+
+    /** 单位 */
+    @ExcelProperty(value = "单位")
+    private String unit;
+
+    /** 加工数量 */
+    @ExcelProperty(value = "数量")
+    private BigDecimal productNum;
+
+    /** 产品单价 */
+    @ExcelProperty(value = "产品单价")
+    private BigDecimal price;
+
+    /** 加工总金额 */
+    @ExcelProperty(value = "金额")
+    private BigDecimal amount;
+
+    /** 平均工资 */
+    @ExcelProperty(value = "每人包活工资")
+    private BigDecimal avgAmount;
+
+    @ExcelProperty(value = "工作人数")
+    private Integer workerNum;
+
+    @ExcelProperty(value = "包活工时")
+    private BigDecimal workTime;
+
+    @ExcelProperty(value = "员工姓名")
+    private String worksName;
+
+    public Date getInstorageTime() {
+        return instorageTime;
+    }
+
+    public void setInstorageTime(Date instorageTime) {
+        this.instorageTime = instorageTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public BigDecimal getProductNum() {
+        return productNum;
+    }
+
+    public void setProductNum(BigDecimal productNum) {
+        this.productNum = productNum;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAvgAmount() {
+        return avgAmount;
+    }
+
+    public void setAvgAmount(BigDecimal avgAmount) {
+        this.avgAmount = avgAmount;
+    }
+
+    public Integer getWorkerNum() {
+        return workerNum;
+    }
+
+    public void setWorkerNum(Integer workerNum) {
+        this.workerNum = workerNum;
+    }
+
+    public BigDecimal getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(BigDecimal workTime) {
+        this.workTime = workTime;
+    }
+
+    public String getWorksName() {
+        return worksName;
+    }
+
+    public void setWorksName(String worksName) {
+        this.worksName = worksName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public Long getWoId() {
+        return woId;
+    }
+
+    public void setWoId(Long woId) {
+        this.woId = woId;
+    }
+
+    @Override
+    public String toString() {
+        return "ExportBaohuoVo{" +
+            "instorageTime=" + instorageTime +
+            ", name='" + name + '\'' +
+            ", content='" + content + '\'' +
+            ", unit='" + unit + '\'' +
+            ", productNum=" + productNum +
+            ", price=" + price +
+            ", amount=" + amount +
+            ", avgAmount=" + avgAmount +
+            ", workerNum=" + workerNum +
+            ", workTime=" + workTime +
+            ", worksName='" + worksName + '\'' +
+            '}';
+    }
+}
+

ruoyi-pay/src/main/java/com/ruoyi/pay/mapper/PayDayWorkHoursMapper.java

@@ -15,5 +15,5 @@ import java.util.List;
  */
 public interface PayDayWorkHoursMapper extends BaseMapperPlus<PayDayWorkHoursMapper, PayDayWorkHours, PayDayWorkHoursVo> {
 
-    List<PayDayWorkHoursQuery> selectSgrDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery);
+    List<PayDayWorkHoursQuery> selectPayDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery);
 }

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

@@ -115,7 +115,7 @@ public class PayDayWorkHoursServiceImpl implements IPayDayWorkHoursService {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
-    public List<PayDayWorkHoursQuery> selectSgrDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery) {
+    public List<PayDayWorkHoursQuery> selectPayDayWorkHoursList2(PayDayWorkHoursQuery sgrDayWorkHoursQuery) {
-        return baseMapper.selectSgrDayWorkHoursList2(sgrDayWorkHoursQuery);
+        return baseMapper.selectPayDayWorkHoursList2(sgrDayWorkHoursQuery);
     }
 }

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

@@ -231,7 +231,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 PayDayWorkHoursQuery sgrDayWorkHoursQuery = new PayDayWorkHoursQuery();
                 sgrDayWorkHoursQuery.setDate(sgrWorkTime.getDate());
                 sgrDayWorkHoursQuery.setEmployeeId(employee.getEmpId());
-                List<PayDayWorkHoursQuery> queryList = dayWorkHoursService.selectSgrDayWorkHoursList2(sgrDayWorkHoursQuery); // 获取日工工时
+                List<PayDayWorkHoursQuery> queryList = dayWorkHoursService.selectPayDayWorkHoursList2(sgrDayWorkHoursQuery); // 获取日工工时
                 for (PayDayWorkHoursQuery query : queryList) {
                     List<PayDwHoursContrast> dwHoursContrasts = query.getDwHoursContrasts();
                     for (PayDwHoursContrast dwHoursContrast : dwHoursContrasts) {
@@ -423,7 +423,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 PayDayWorkHoursQuery sgrDayWorkHoursQuery = new PayDayWorkHoursQuery();
                 sgrDayWorkHoursQuery.setDate(sgrWorkTime.getDate());
                 sgrDayWorkHoursQuery.setEmployeeId(employee.getEmpId());
-                List<PayDayWorkHoursQuery> queryList = dayWorkHoursService.selectSgrDayWorkHoursList2(sgrDayWorkHoursQuery); // 获取日工工时
+                List<PayDayWorkHoursQuery> queryList = dayWorkHoursService.selectPayDayWorkHoursList2(sgrDayWorkHoursQuery); // 获取日工工时
                 for (PayDayWorkHoursQuery query : queryList) {
                     List<PayDwHoursContrast> dwHoursContrasts = query.getDwHoursContrasts();
                     for (PayDwHoursContrast dwHoursContrast : dwHoursContrasts) {

ruoyi-pay/src/main/resources/mapper/pay/PayDayWorkHoursMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="PayDayWorkHoursQuery" id="PayDayWorkHoursQueryResult">
         <result property="id"    column="id"    />
+        <result property="tenantId" column="tenant_id"/>
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="employeeId"    column="employee_id"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="date"    column="date"    />
         <result property="dwYearMonth"    column="dw_year_month"    />
         <result property="note"    column="note"    />
-        <collection property="dwHoursContrasts" ofType="SgrDwHoursContrast">
+        <collection property="dwHoursContrasts" ofType="PayDwHoursContrast">
             <result property="startTime"    column="con_start"    />
             <result property="endTime"    column="con_end"    />
             <result property="isHelper"    column="con_helper"    />
@@ -36,12 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </collection>
     </resultMap>
 
-    <select id="selectSgrDayWorkHoursList2" parameterType="PayDayWorkHoursQuery" resultMap="PayDayWorkHoursQueryResult">
+    <select id="selectPayDayWorkHoursList2" parameterType="PayDayWorkHoursQuery" resultMap="PayDayWorkHoursQueryResult">
         select d.*,c.start_time con_start,c.end_time con_end,c.is_helper con_helper,c.hours con_hours,c.salesman con_salesman from pay_day_work_hours  d  join  pay_dw_hours_contrast c
         on d.id=c.dw_hours_id
         /* select d.*  from sgr_day_work_hours d  inner join  sgr_dw_hours_contrast c   on d.id=c.dw_hours_id*/
         <where>
             <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="tenantId != null "> and d.tenant_id = #{tenantId}</if>
             <if test="deptName != null  and deptName != ''"> and d.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="employeeId != null "> and employee_id = #{employeeId}</if>
             <if test="empName != null  and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
@@ -52,4 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+<!--    <select id="selectVoPage2" parameterType="PayDayWorkHoursBo" resultMap="PayDayWorkHoursQueryResult">
+        select d.*,c.start_time con_start,c.end_time con_end,c.is_helper con_helper,c.hours con_hours,c.salesman con_salesman from pay_day_work_hours  d  join  pay_dw_hours_contrast c
+        on d.id=c.dw_hours_id
+            ${ew.customSqlSegment}
+    </select>-->
+
+
 </mapper>