bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

权限

This commit is contained in:
方亮 2025-09-29 18:02:59 +08:00
parent 09cdf46805
commit d7578f8afc
20 changed files with 141 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerAttController.java
View File

@ -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<String,String> map=dealWithPermission();
Map<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.copyProperties(map, o);
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
startPage();
List<BmWorkerAtt> list = service.getProAttList(o);
@ -176,7 +175,7 @@ public class BmWorkerAttController extends BaseController {
Map<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.copyProperties(map, o);
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
List<BmWorkerAtt> list = service.getProAttList(o);
List<BmWorkerAttProExport> exportList = list.stream()

16
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java
View File

@ -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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.copyProperties(map, o);
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
startPage();
List<BmWorkerContract> list = service.selectContractList(o);

20
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerLightController.java
View File

@ -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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
startPage();
List<BmWorkerLight> list = service.getSubComLightList(o);
return getDataTable(list);

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/HomePageController.java
View File

@ -50,7 +50,7 @@ public class HomePageController extends BaseController {
Map<String,String> 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<String,String> 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<String,String> 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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.populate(o, map);
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
}
return service.getEinWorkerDistribution(o);

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmOrgController.java
View File

@ -49,7 +49,7 @@ public class PmOrgController extends BaseController {
Map<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.populate(pmOrg, map);
org.apache.commons.beanutils.BeanUtils.populate(pmOrg, map);
}
startPage();
List<PmOrgVo> list = pmOrgService.selectPmOrgList(pmOrg);

2
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmProjectController.java
View File

@ -59,7 +59,7 @@ public class PmProjectController extends BaseController {
Map<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.populate(pmProject, map);
org.apache.commons.beanutils.BeanUtils.populate(pmProject, map);
}
startPage();
List<PmProjectVo> list = pmProjectService.selectProjectList(pmProject);

4
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubComController.java
View File

@ -46,7 +46,7 @@ public class PmSubComController extends BaseController {
Map<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.populate(pmSubCompany, map);
org.apache.commons.beanutils.BeanUtils.populate(pmSubCompany, map);
}
startPage();
List<PmSubCompany> list = pmSubComService.selectSubCompanyList(pmSubCompany);
@ -108,7 +108,7 @@ public class PmSubComController extends BaseController {
Map<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.populate(pmSubCompany, map);
org.apache.commons.beanutils.BeanUtils.populate(pmSubCompany, map);
}
List<PmSubCompany> list = pmSubComService.selectSubCompanyListAll(pmSubCompany);
return getDataTable(list);

9
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java
View File

@ -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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
startPage();
List<PmWorker> list = service.selectWorkList(o);
return getDataTable(list);

5
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java
View File

@ -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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
BeanUtils.copyProperties(map, o);
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
startPage();
List<PmWorker> list = service.selectWorkList(o);

28
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java
View File

@ -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<ProDto> list = repairCardApplyMapper.proList();
Map<String,String> map = dealWithPermission();
PmProject o = new PmProject();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
org.apache.commons.beanutils.BeanUtils.populate(o, map);
}
List<ProDto> 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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
org.apache.commons.beanutils.BeanUtils.populate(cardApply, map);
}
startPage();
List<RepairCardApplyDto> list = repairCardApplyMapper.list(cardApply);
return getDataTable(list);
@ -148,8 +161,7 @@ public class RepairCardApplyController extends BaseController {
fileMsg= Sm4Utils.decrypt(fileMsg);
List<WebFileDto> 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<String,String> map = dealWithPermission();
if(!map.isEmpty()){
// 3. 将 map 中的值复制到 o 对象中
org.apache.commons.beanutils.BeanUtils.populate(cardApply, map);
}
startPage();
List<CardStatisticsDto> list = repairCardApplyMapper.getCardStatistics(cardApply);
return getDataTable(list);

13
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/RepairCardApplyDto.java
View File

@ -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<String> fileIdList;
/**
* 分公司id
*/
private String subComId;
/**
* 项目部id
*/
private String orgId;
}

3
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/RepairCardApplyMapper.java
View File

@ -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<RepairCardApplyDto> list(RepairCardApplyDto cardApply);
List<ProDto> proList();
List<ProDto> proList(PmProject o);
List<RepairCardRecordDto> getRepairCardDetails(RepairCardApplyDto cardApply);

3
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/RepairCardApplyService.java
View File

@ -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<RepairCardApplyDto> list(RepairCardApplyDto cardApply);
List<ProDto> proList();
List<ProDto> proList(PmProject o);
RepairCardDetailsDto getRepairCardDetails(RepairCardApplyDto cardApply);

5
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/RepairCardApplyServiceImpl.java
View File

@ -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<ProDto> proList() {
return repairCardApplyMapper.proList();
public List<ProDto> proList(PmProject o) {
return repairCardApplyMapper.proList(o);
}
@Override

16
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerContractMapper.xml
View File

@ -41,10 +41,10 @@
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.bmw.domain.vo.BmWorkerContract" useGeneratedKeys="true">
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})
</insert>
@ -94,11 +94,11 @@
</if>
</if>
<!-- 权限相关 -->
<if test="subComId != null and subComId != ''">
AND pp.sub_com_id = #{subComId}
</if>
<if test="orgId != null and orgId != ''">
AND pp.org_id = #{orgId}
AND (pp.org_id = #{orgId} or pp.org_id is null)
</if>
<if test="subComId != null and subComId != ''">
AND (pp.sub_com_id = #{subComId} or pp.sub_com_id is null)
</if>
</select>
@ -197,4 +197,4 @@
</otherwise>
</choose>
</update>
</mapper>
</mapper>

3
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerLightMapper.xml
View File

@ -31,6 +31,9 @@
LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id
WHERE
psc.is_active = 1
<if test="subComId != null and subComId != ''">
AND psc.id = #{subComId}
</if>
GROUP BY
psc.id
</select>

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

@ -277,6 +277,15 @@
<if test="subComId != null">
AND psc.id = #{subComId}
</if>
<if test="teamId != null">
AND bwem.team_id = #{teamId}
</if>
<if test="subId != null">
AND bwem.sub_id = #{subId}
</if>
<if test="proId != null">
AND bwem.pro_id = #{proId}
</if>
<if test="lightStatus != null">
AND bwem.light_status = #{lightStatus}
</if>
@ -376,4 +385,4 @@
FROM
`bm_worker_contract` where is_active = 1 and worker_id = #{id}
</select>
</mapper>
</mapper>

2
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamContractMapper.xml
View File

@ -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'
<if test="teamName!=null and teamName!= ''">
and pstc.team_name LIKE CONCAT('%', #{teamName}, '%')
</if>

8
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmWorkerMapper.xml
View File

@ -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
<if test="name != null and name != ''">
@ -106,6 +107,13 @@
<if test="einStatus != null and einStatus != ''">
AND IFNULL(bwem.ein_status,2) = #{einStatus}
</if>
<if test="orgId != null and orgId != ''">
AND (pp.org_id = #{orgId} or pp.org_id is null)
</if>
<if test="subComId != null and subComId != ''">
AND (pp.sub_com_id = #{subComId} or pp.sub_com_id is null)
</if>
order by bwem.ein_status desc
</select>
<select id="getWorkerByNumber" resultMap="BaseResultMap">

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

@ -206,20 +206,34 @@
brca.check_time as checkTime
from bm_repair_card_apply brca
left join pm_project pp on pp.id = brca.pro_id
where 1=1
<if test="applyUser != null">
and brca.apply_user like concat('%',#{applyUser},'%')
</if>
<if test="proId != null">
and brca.pro_id = #{proId}
</if>
<if test="checkStatus != null">
and brca.check_status = #{checkStatus}
</if>
<where>
<if test="applyUser != null">
and brca.apply_user like concat('%',#{applyUser},'%')
</if>
<if test="proId != null">
and brca.pro_id = #{proId}
</if>
<if test="checkStatus != null">
and brca.check_status = #{checkStatus}
</if>
<if test="orgId != null and orgId != ''">
AND pp.org_id = #{orgId}
</if>
<if test="subComId != null and subComId != ''">
AND pp.sub_com_id = #{subComId}
</if>
</where>
</select>
<select id="proList" resultType="com.bonus.bmw.domain.dto.ProDto">
select id, pro_name as proName
from pm_project where is_active = 1
from pm_project pp where is_active = 1
<if test="orgId != null and orgId != ''">
AND pp.org_id = #{orgId}
</if>
<if test="subComId != null and subComId != ''">
AND pp.sub_com_id = #{subComId}
</if>
</select>
<select id="getRepairCardDetails" resultType="com.bonus.bmw.domain.dto.RepairCardRecordDto">
select pp.pro_name as proName,
@ -279,6 +293,12 @@
<if test="proId != null">
AND brca.pro_id = #{proId}
</if>
<if test="orgId != null and orgId != ''">
AND pp.org_id = #{orgId}
</if>
<if test="subComId != null and subComId != ''">
AND pp.sub_com_id = #{subComId}
</if>
GROUP BY
brca.pro_id
ORDER BY