diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java index 6f3f2db..7927ccc 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageSubController.java +++ b/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 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 map = dealWithPermission(); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePoVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/HomePagePoVo.java new file mode 100644 index 0000000..c571d73 --- /dev/null +++ b/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 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; + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java index a849828..3904805 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/HomePageSubMapper.java +++ b/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 getWorkerMsg(HomePagePo o); + List getWorkerMsg(HomePagePoVo o); /** * 获取出场未结算详情 @@ -59,4 +60,4 @@ public interface HomePageSubMapper { HomePagePmWorkerVo getWorkerMsgById(HomePagePo o); List getWorkerLightMsg(HomePagePo o); -} \ No newline at end of file +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java index 0cb5cde..063824b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/HomePageSubService.java +++ b/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 getWorkerMsg(HomePagePo o); + List getWorkerMsg(HomePagePoVo o); /** * 出场未结算详情 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java index f654993..95873df 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/HomePageSubServiceImpl.java +++ b/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 getWorkerMsg(HomePagePo o) { + public List 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); } diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml index aeb1c8e..9e04e86 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml +++ b/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 @@ AND bwem.pro_id = #{proId} + + AND bwem.pro_id IN + + #{item} + + AND bwem.light_status = #{lightStatus} @@ -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} + + AND bwem.pro_id = #{proId} +