From d7578f8afc110f8dd9b1682e139c3b50243b5677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Mon, 29 Sep 2025 18:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bmw/controller/BmWorkerAttController.java | 7 ++-- .../BmWorkerContractController.java | 16 ++----- .../controller/BmWorkerLightController.java | 20 ++++++--- .../bmw/controller/HomePageController.java | 8 ++-- .../bonus/bmw/controller/PmOrgController.java | 2 +- .../bmw/controller/PmProjectController.java | 2 +- .../bmw/controller/PmSubComController.java | 4 +- .../bmw/controller/PmWorkerController.java | 9 ++++ .../controller/PmWorkerExitController.java | 5 +-- .../controller/RepairCardApplyController.java | 28 ++++++++++--- .../bmw/domain/dto/RepairCardApplyDto.java | 13 +++++- .../bmw/mapper/RepairCardApplyMapper.java | 3 +- .../bmw/service/RepairCardApplyService.java | 3 +- .../impl/RepairCardApplyServiceImpl.java | 5 ++- .../mapper/bmw/BmWorkerContractMapper.xml | 16 +++---- .../mapper/bmw/BmWorkerLightMapper.xml | 3 ++ .../mapper/bmw/HomePageSubMapper.xml | 11 ++++- .../mapper/bmw/PmSubTeamContractMapper.xml | 2 +- .../resources/mapper/bmw/PmWorkerMapper.xml | 8 ++++ .../mapper/bmw/RepairCardApplyMapper.xml | 42 ++++++++++++++----- 20 files changed, 141 insertions(+), 66 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java index 7da595b..91f1500 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java @@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -75,10 +74,10 @@ public class BmWorkerAttController extends BaseController { @SysLog(title = "工程考勤统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->考勤管理->考勤统计", details = "工程考勤统计") public TableDataInfo getProAttList(BmWorkerAtt o) { try { - Map map=dealWithPermission(); + Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.copyProperties(map, o); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } startPage(); List list = service.getProAttList(o); @@ -176,7 +175,7 @@ public class BmWorkerAttController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.copyProperties(map, o); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } List list = service.getProAttList(o); List exportList = list.stream() diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java index 2d792fa..0fef739 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java @@ -1,12 +1,8 @@ package com.bonus.bmw.controller; -import com.bonus.bmw.domain.dto.FileBasicMsgDto; + import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.vo.BmWorkerContract; -import com.bonus.bmw.domain.vo.BmWorkerWageCard; import com.bonus.bmw.service.BmWorkerContractService; -import com.bonus.bmw.service.impl.BmWorkerContractServiceImpl; -import com.bonus.bmw.service.impl.FileUploadUtils; -import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -18,20 +14,14 @@ import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; -import com.bonus.system.api.domain.SysRole; -import com.bonus.system.api.domain.SysUser; -import org.springframework.beans.BeanUtils; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; @@ -62,7 +52,7 @@ public class BmWorkerContractController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.copyProperties(map, o); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } startPage(); List list = service.selectContractList(o); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerLightController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerLightController.java index 5b54efd..45d65ff 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerLightController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerLightController.java @@ -1,8 +1,8 @@ package com.bonus.bmw.controller; -import com.bonus.bmw.domain.dto.PmWorkerDto; -import com.bonus.bmw.domain.vo.*; + +import com.bonus.bmw.domain.vo.BmWorkerLight; +import com.bonus.bmw.domain.vo.BmWorkerLightExport; import com.bonus.bmw.service.BmWorkerLightService; -import com.bonus.bmw.service.impl.BmWorkerLightServiceImpl; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; @@ -12,15 +12,20 @@ import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import org.springframework.beans.BeanUtils; -import org.springframework.web.bind.annotation.*; - import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; + /** * 红绿灯统计 * @@ -46,6 +51,11 @@ public class BmWorkerLightController extends BaseController { @SysLog(title = "红绿灯统计", businessType = OperaType.QUERY, logType = 0, module = "施工人员->红绿灯管理->红绿灯统计", details = "分公司红绿灯统计") public TableDataInfo getSubComLightList(BmWorkerLight o) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } startPage(); List list = service.getSubComLightList(o); return getDataTable(list); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java index 1629b56..720488a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java @@ -50,7 +50,7 @@ public class HomePageController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(o, map); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } } return service.getDataOverview(o); @@ -74,7 +74,7 @@ public class HomePageController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(o, map); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } } return service.getWorkerAtt(o); @@ -98,7 +98,7 @@ public class HomePageController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(o, map); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } } return service.getProjectMsg(o); @@ -122,7 +122,7 @@ public class HomePageController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(o, map); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } } return service.getEinWorkerDistribution(o); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java index dfcb0a2..34e62bf 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java @@ -49,7 +49,7 @@ public class PmOrgController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(pmOrg, map); + org.apache.commons.beanutils.BeanUtils.populate(pmOrg, map); } startPage(); List list = pmOrgService.selectPmOrgList(pmOrg); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java index 5bbb15f..8f0ffb4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java @@ -59,7 +59,7 @@ public class PmProjectController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(pmProject, map); + org.apache.commons.beanutils.BeanUtils.populate(pmProject, map); } startPage(); List list = pmProjectService.selectProjectList(pmProject); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java index 5c7f1fa..d9d6850 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java @@ -46,7 +46,7 @@ public class PmSubComController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(pmSubCompany, map); + org.apache.commons.beanutils.BeanUtils.populate(pmSubCompany, map); } startPage(); List list = pmSubComService.selectSubCompanyList(pmSubCompany); @@ -108,7 +108,7 @@ public class PmSubComController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.populate(pmSubCompany, map); + org.apache.commons.beanutils.BeanUtils.populate(pmSubCompany, map); } List list = pmSubComService.selectSubCompanyListAll(pmSubCompany); return getDataTable(list); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java index e6db1a3..1c1a7e9 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java @@ -16,6 +16,7 @@ import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import org.apache.commons.beanutils.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -26,8 +27,11 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; + /** * 人员入场 * @@ -53,6 +57,11 @@ public class PmWorkerController extends BaseController { @SysLog(title = "人员入场管理", businessType = OperaType.QUERY, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "查询人员入场列表") public TableDataInfo list(PmWorkerDto o) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } startPage(); List list = service.selectWorkList(o); return getDataTable(list); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java index c1ab375..41a4650 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java @@ -2,11 +2,9 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.dto.PmWorkerDto; import com.bonus.bmw.domain.dto.WebFileDto; -import com.bonus.bmw.domain.vo.BmWorkerWageCard; import com.bonus.bmw.domain.vo.PmWorker; import com.bonus.bmw.domain.vo.PmWorkerExitExport; import com.bonus.bmw.service.PmWorkerExitService; -import com.bonus.bmw.service.impl.PmWorkerServiceImpl; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -20,7 +18,6 @@ import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -59,7 +56,7 @@ public class PmWorkerExitController extends BaseController { Map map = dealWithPermission(); if(!map.isEmpty()){ // 3. 将 map 中的值复制到 o 对象中 - BeanUtils.copyProperties(map, o); + org.apache.commons.beanutils.BeanUtils.populate(o, map); } startPage(); List list = service.selectWorkList(o); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java index 8e02d71..65baa7b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java @@ -1,7 +1,7 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.dto.*; -import com.bonus.bmw.domain.po.PmSub; +import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.service.RepairCardApplyService; import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import static com.bonus.bmw.utils.OwnPermissionUtil.dealWithPermission; + /** * @Author：liang.chao * @Date：2025/8/13 - 10:31 @@ -39,7 +41,13 @@ public class RepairCardApplyController extends BaseController { @GetMapping("/proList") public AjaxResult proList() { try { - List list = repairCardApplyMapper.proList(); + Map map = dealWithPermission(); + PmProject o = new PmProject(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(o, map); + } + List list = repairCardApplyMapper.proList(o); return AjaxResult.success(list); } catch (Exception e) { logger.error(e.toString(), e); @@ -68,6 +76,11 @@ public class RepairCardApplyController extends BaseController { @SysLog(title = "补卡申请列表", businessType = OperaType.QUERY, logType = 0, module = "考勤管理-补卡申请", details = "查询补卡申请列表") public TableDataInfo list(RepairCardApplyDto cardApply) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(cardApply, map); + } startPage(); List list = repairCardApplyMapper.list(cardApply); return getDataTable(list); @@ -148,8 +161,7 @@ public class RepairCardApplyController extends BaseController { fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class); - AjaxResult ajaxResult = repairCardApplyMapper.updateRepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files)); - return ajaxResult; + return repairCardApplyMapper.updateRepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files)); } /** @@ -161,8 +173,7 @@ public class RepairCardApplyController extends BaseController { @PostMapping("/delRepairCardApply") public AjaxResult delRepairCardApply(@RequestBody RepairCardApplyDto cardApplyDto) { Integer num = repairCardApplyMapper.delRepairCardApply(cardApplyDto); - AjaxResult ajaxResult = num > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败"); - return ajaxResult; + return num > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败"); } /** @@ -186,6 +197,11 @@ public class RepairCardApplyController extends BaseController { @SysLog(title = "补卡统计列表", businessType = OperaType.QUERY, logType = 0, module = "考勤管理-补卡申请", details = "查询补卡统计列表") public TableDataInfo getCardStatistics(RepairCardApplyDto cardApply) { try { + Map map = dealWithPermission(); + if(!map.isEmpty()){ + // 3. 将 map 中的值复制到 o 对象中 + org.apache.commons.beanutils.BeanUtils.populate(cardApply, map); + } startPage(); List list = repairCardApplyMapper.getCardStatistics(cardApply); return getDataTable(list); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java index 06782d7..da77585 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java @@ -3,7 +3,6 @@ package com.bonus.bmw.domain.dto; import com.bonus.common.core.annotation.Excel; import com.bonus.system.api.model.UploadFileVo; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -128,4 +127,16 @@ public class RepairCardApplyDto { * 删除文件id集合 */ private List fileIdList; + + + /** + * 分公司id + */ + private String subComId; + + /** + * 项目部id + */ + private String orgId; + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java index 1b5f2be..89bce74 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java @@ -2,6 +2,7 @@ package com.bonus.bmw.mapper; import com.bonus.bmw.domain.dto.*; import com.bonus.bmw.domain.po.MapBeanPo; +import com.bonus.bmw.domain.po.PmProject; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +13,7 @@ public interface RepairCardApplyMapper { List list(RepairCardApplyDto cardApply); - List proList(); + List proList(PmProject o); List getRepairCardDetails(RepairCardApplyDto cardApply); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/RepairCardApplyService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/RepairCardApplyService.java index c16dbb3..7103e1a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/RepairCardApplyService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/RepairCardApplyService.java @@ -1,6 +1,7 @@ package com.bonus.bmw.service; import com.bonus.bmw.domain.dto.*; +import com.bonus.bmw.domain.po.PmProject; import com.bonus.common.core.web.domain.AjaxResult; import java.util.List; @@ -13,7 +14,7 @@ import java.util.Map; public interface RepairCardApplyService { List list(RepairCardApplyDto cardApply); - List proList(); + List proList(PmProject o); RepairCardDetailsDto getRepairCardDetails(RepairCardApplyDto cardApply); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java index 905e0e4..591a383 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.dto.*; import com.bonus.bmw.domain.po.MapBeanPo; +import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.mapper.RepairCardApplyMapper; import com.bonus.bmw.service.RepairCardApplyService; import com.bonus.common.core.constant.Constants; @@ -39,8 +40,8 @@ public class RepairCardApplyServiceImpl implements RepairCardApplyService { } @Override - public List proList() { - return repairCardApplyMapper.proList(); + public List proList(PmProject o) { + return repairCardApplyMapper.proList(o); } @Override diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml index 16013b9..e575121 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml @@ -41,10 +41,10 @@ insert into bm_worker_contract (worker_id, contract_code, contract_term_type, contract_start_date, - contract_stop_date, wage_approved_way, wage_criterion, day_rate, contract_upload_date, + contract_stop_date, wage_approved_way, wage_criterion, day_rate, contract_upload_date, contract_invalid_date, create_user) - values (#{workerId}, #{contractCode}, #{contractTermType}, #{contractStartDate}, - #{contractStopDate}, #{wageApprovedWay}, #{wageCriterion}, #{dayRate}, #{contractUploadDate}, + values (#{workerId}, #{contractCode}, #{contractTermType}, #{contractStartDate}, + #{contractStopDate}, #{wageApprovedWay}, #{wageCriterion}, #{dayRate}, #{contractUploadDate}, #{contractInvalidDate}, #{createUser}) @@ -94,11 +94,11 @@ - - AND pp.sub_com_id = #{subComId} - - AND pp.org_id = #{orgId} + AND (pp.org_id = #{orgId} or pp.org_id is null) + + + AND (pp.sub_com_id = #{subComId} or pp.sub_com_id is null) @@ -197,4 +197,4 @@ - \ No newline at end of file + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerLightMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerLightMapper.xml index 56e9da7..f63f233 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerLightMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerLightMapper.xml @@ -31,6 +31,9 @@ LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id WHERE psc.is_active = 1 + + AND psc.id = #{subComId} + GROUP BY psc.id 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 0a88887..aeb1c8e 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 @@ -277,6 +277,15 @@ AND psc.id = #{subComId} + + AND bwem.team_id = #{teamId} + + + AND bwem.sub_id = #{subId} + + + AND bwem.pro_id = #{proId} + AND bwem.light_status = #{lightStatus} @@ -376,4 +385,4 @@ FROM `bm_worker_contract` where is_active = 1 and worker_id = #{id} - \ No newline at end of file + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml index 247069f..2846ca8 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml @@ -31,7 +31,7 @@ pstc.team_ein_time,pstc.team_ein_status,pstc.team_exit_time from pm_sub_team_contract pstc left join pm_project pp on pstc.pro_id = pp.id - where is_active = '1' + where pstc.is_active = '1' and pstc.team_name LIKE CONCAT('%', #{teamName}, '%') diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml index f6c4ec1..865c3eb 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml @@ -80,6 +80,7 @@ FROM pm_worker pw LEFT JOIN bm_worker_ein_msg bwem ON pw.id = bwem.worker_id + LEFT join pm_project pp ON bwem.pro_id = pp.id WHERE pw.is_active = 1 @@ -106,6 +107,13 @@ AND IFNULL(bwem.ein_status,2) = #{einStatus} + + AND (pp.org_id = #{orgId} or pp.org_id is null) + + + AND (pp.sub_com_id = #{subComId} or pp.sub_com_id is null) + + order by bwem.ein_status desc