bug修改

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java

@@ -1,6 +1,7 @@
 package com.bonus.bmw.controller;
 
 import com.bonus.bmw.domain.po.HomePagePo;
+import com.bonus.bmw.domain.po.HomePagePoVo;
 import com.bonus.bmw.domain.vo.*;
 import com.bonus.bmw.service.HomePageSubService;
 import com.bonus.common.core.utils.StringUtils;
@@ -156,7 +157,7 @@ public class HomePageSubController extends BaseController {
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query"))
     @GetMapping("/getWorkerMsg")
     @SysLog(title = "人员详情", businessType = OperaType.QUERY, logType = 0, module = "首页->二级页面", details = "人员详情")
-    public TableDataInfo getWorkerMsg(HomePagePo o) {
+    public TableDataInfo getWorkerMsg(HomePagePoVo o) {
         try {
             if(StringUtils.isNotEmpty(Collections.singleton(o.getSubComId()))){
                 Map<String,String> map = dealWithPermission();
@@ -363,7 +364,7 @@ public class HomePageSubController extends BaseController {
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("home:page:query"))
     @PostMapping("/workerExport")
     @SysLog(title = "人员导出", businessType = OperaType.EXPORT, logType = 0, module = "首页->二级页面", details = "人员导出")
-    public void workerExport(HttpServletResponse response, HomePagePo o) {
+    public void workerExport(HttpServletResponse response, HomePagePoVo o) {
         try {
             if(StringUtils.isNotEmpty(Collections.singleton(o.getSubComId()))){
                 Map<String,String> map = dealWithPermission();

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePoVo.java

@@ -0,0 +1,66 @@
+package com.bonus.bmw.domain.po;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HomePagePoVo {
+
+    private Integer id;
+
+    private String name;
+
+    private Integer subComId;
+
+    private String proId;
+
+    private List<String> proIds;
+
+    private Integer subId;
+
+    private Integer teamId;
+
+    private String currentDay;
+
+    private Integer mainProId;
+
+    private String mainProName;
+
+    private String proName;
+
+    private String proType;
+
+    private String volLevel;
+
+    private String proStatus;
+
+    private Integer subCompanyId;
+
+    private String subComName;
+
+    private String subName;
+
+    private String teamName;
+
+    private String workerName;
+
+    private Integer lightStatus;
+
+    private Integer einStatus;
+
+    private Integer startAge;
+
+    private Integer endAge;
+
+    private String sex;
+
+    private Integer isAtt;
+
+    private Integer lightStatusSeven;
+
+    private Integer postId;
+
+    private String idNumber;
+
+}

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java

@@ -1,6 +1,7 @@
 package com.bonus.bmw.mapper;
 
 import com.bonus.bmw.domain.po.HomePagePo;
+import com.bonus.bmw.domain.po.HomePagePoVo;
 import com.bonus.bmw.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -42,7 +43,7 @@ public interface HomePageSubMapper {
      * @param o
      * @return
      */
-    List<HomePageSubProVo> getWorkerMsg(HomePagePo o);
+    List<HomePageSubProVo> getWorkerMsg(HomePagePoVo o);
 
     /**
      * 获取出场未结算详情
@@ -59,4 +60,4 @@ public interface HomePageSubMapper {
     HomePagePmWorkerVo getWorkerMsgById(HomePagePo o);
 
     List<MapBeanVo> getWorkerLightMsg(HomePagePo o);
-}
+}

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java

@@ -1,6 +1,7 @@
 package com.bonus.bmw.service;
 
 import com.bonus.bmw.domain.po.HomePagePo;
+import com.bonus.bmw.domain.po.HomePagePoVo;
 import com.bonus.bmw.domain.vo.HomePageSubProVo;
 import com.bonus.common.core.web.domain.AjaxResult;
 
@@ -41,7 +42,7 @@ public interface HomePageSubService {
      * @param o
      * @return
      */
-    List<HomePageSubProVo> getWorkerMsg(HomePagePo o);
+    List<HomePageSubProVo> getWorkerMsg(HomePagePoVo o);
 
     /**
      * 出场未结算详情

bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java

@@ -2,6 +2,7 @@ package com.bonus.bmw.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.bonus.bmw.domain.po.HomePagePo;
+import com.bonus.bmw.domain.po.HomePagePoVo;
 import com.bonus.bmw.domain.vo.*;
 import com.bonus.bmw.mapper.HomePageSubMapper;
 import com.bonus.bmw.service.HomePageSubService;
@@ -11,6 +12,7 @@ import com.bonus.system.api.model.UploadFileVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -47,8 +49,13 @@ public class HomePageSubServiceImpl implements HomePageSubService {
     }
 
     @Override
-    public List<HomePageSubProVo> getWorkerMsg(HomePagePo o) {
+    public List<HomePageSubProVo> getWorkerMsg(HomePagePoVo o) {
         o.setCurrentDay(DateUtil.today());
+        if (o.getProId() != null){
+            String[] split = o.getProId().split(",");
+            o.setProIds(Arrays.asList(split));
+            o.setProId(null);
+        }
         return mapper.getWorkerMsg(o);
     }
 

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml

@@ -118,15 +118,13 @@
         LEFT JOIN bm_att_person bap ON bap.pro_id = pp.id AND pst.id = bap.team_id AND bap.att_day = #{startDate}
     WHERE
       pp.id = #{proId}
-      AND pp.is_active = 1
+      AND pp.is_active = 1 and pst.id is not null
     <if test="subName != null and subName != ''">
       AND ps.sub_name = #{subName}
     </if>
     <if test="teamName != null and teamName != ''">
       AND pst.team_name = #{teamName}
     </if>
-
-
     GROUP BY
     pst.id
   </select>

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml

@@ -249,6 +249,7 @@
     pw.phone,
     bwem.post_name,
     bwem.team_name,
+    bwem.pro_id,
     bwem.pro_name,
     bwem.sub_name,
     psc.sub_company_name,
@@ -257,7 +258,7 @@
     bap.att_time
       from pm_worker pw
     inner JOIN bm_worker_ein_msg bwem ON pw.id = bwem.worker_id and bwem.is_active = 1
-    left join bm_att_person bap ON pw.id = bap.worker_id and bap.is_active = 1 and bap.att_day = #{currentDay}
+    left join bm_att_person bap ON bwem.worker_id = bap.worker_id and bwem.pro_id = bap.pro_id and bap.is_active = 1 and bap.att_day = #{currentDay}
     inner join pm_project pp ON bwem.pro_id = pp.id and pp.is_active = 1
     left join pm_sub_company psc ON pp.sub_com_id = psc.id
     WHERE
@@ -286,6 +287,12 @@
     <if test="proId != null">
       AND bwem.pro_id = #{proId}
     </if>
+    <if test="proIds != null">
+      AND bwem.pro_id IN
+      <foreach item="item" collection="proIds" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test="lightStatus != null">
       AND bwem.light_status = #{lightStatus}
     </if>
@@ -370,6 +377,9 @@
     LEFT JOIN (select * from bm_worker_wage_card where worker_id = #{id} and is_active = 1 limit 1)  bwwc ON pw.id = bwwc.worker_id
     WHERE
     pw.id = #{id}
+    <if test="proId != null">
+      AND bwem.pro_id = #{proId}
+    </if>
   </select>
 
   <select id="getWorkerLightMsg" resultType="com.bonus.bmw.domain.vo.MapBeanVo">

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml

@@ -107,7 +107,7 @@
   <select id="getWorkerWage" resultType="com.bonus.bmw.domain.vo.ProStatisticsPo">
     SELECT
       sum(pp.net_salary) AS salaryMoneyNum,
-      sum(pp.id) AS payrollNum,
+      count(pp.id) AS payrollNum,
       sum(pp.pay_num) AS payrollWorkerTime
     FROM
         tb_pro_month_table pp

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/RepairCardApplyMapper.xml

@@ -285,11 +285,13 @@
             pp.pro_name proName,
             count( distinct brca.id ) num,
             count( distinct brcr.worker_id ) personNum,
-            sum( brcr.repair_day ) days,
+            count(DISTINCT bap.att_day) days,
             brca.create_time createTime
         FROM
             bm_repair_card_apply brca
                 LEFT JOIN bm_repair_card_record brcr ON brca.id = brcr.apply_id
+                LEFT JOIN bm_att_person bap ON brca.pro_id = bap.pro_id
+                AND bap.is_repair = 1
                 LEFT JOIN pm_project pp ON pp.id = brca.pro_id
         WHERE
             brca.is_active = 1

bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/SalaryStatisticsMapper.xml

@@ -101,7 +101,7 @@
       tpmtr.sub_id,
       tpmtr.sub_name,
       count(DISTINCT tpmtr.pro_id) AS proNum,
-      SUM(net_salary) AS netSalary
+      SUM(tpmtr.actual_money) AS netSalary
     FROM
       tb_pro_month_table_roster tpmtr
         LEFT JOIN tb_pro_month_table tpmt ON tpmt.id = tpmtr.month_id