ycl-pojo/src/main/java/com/ycl/platform/domain/query/CalculateReportQuery.java
@@ -21,5 +21,7 @@ private String unitName; private Integer unitId; }
@@ -21,4 +21,6 @@ @ApiModelProperty("状态") private String status; private Integer unitId; } ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -47,5 +47,10 @@ * 状态 */ private String status; /** * 单位id */ private Integer unitId; }
@@ -22,6 +22,7 @@ import com.ycl.platform.service.ICalculateRuleService; import com.ycl.system.Result; import com.ycl.system.page.PageUtil; import com.ycl.utils.SecurityUtils; import enumeration.general.CalculateReportStatusEnum; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -124,6 +125,7 @@ @Override public Result page(CalculateReportQuery query) { IPage<CalculateReportVO> page = PageUtil.getPage(query, CalculateReportVO.class); query.setUnitId(SecurityUtils.getUnitId()); baseMapper.page(query, page); page.getRecords().stream().forEach(item -> { if (Objects.isNull(item)) { ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -9,6 +9,7 @@ import com.ycl.platform.mapper.ContractResultRecordMapper; import com.ycl.platform.service.IContractResultService; import com.ycl.utils.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import utils.DateUtils; @@ -23,11 +24,11 @@ * @date 2024-04-01 */ @Service @RequiredArgsConstructor public class ContractResultServiceImpl extends ServiceImpl<ContractResultMapper, ContractResult> implements IContractResultService { @Autowired private ContractResultMapper checkResultMapper; @Autowired private ContractResultRecordMapper contractResultRecordMapper; private final ContractResultMapper checkResultMapper; private final ContractResultRecordMapper contractResultRecordMapper; /** @@ -49,6 +50,7 @@ */ @Override public List<ContractResultVO> selectCheckResultList(ContractResultVO contractResult) { contractResult.setUnitId(Long.valueOf(SecurityUtils.getUnitId())); return checkResultMapper.selectCheckResultList(contractResult); }
@@ -11,6 +11,7 @@ import com.ycl.system.entity.SysUser; import com.ycl.utils.SecurityUtils; import enumeration.general.AuditingStatus; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,15 +28,13 @@ * @date 2024-04-01 */ @Service @RequiredArgsConstructor public class ContractScoreServiceImpl extends ServiceImpl<ContractScoreMapper, ContractScore> implements IContractScoreService { @Autowired private ContractScoreMapper contractScoreMapper; @Autowired private YwUnitMapper ywunitMapper; @Autowired private TContractMapper contractMapper; @Autowired private CalculateRuleMapper calculateRuleMapper; private final ContractScoreMapper contractScoreMapper; private final YwUnitMapper ywunitMapper; private final TContractMapper contractMapper; private final CalculateRuleMapper calculateRuleMapper; /** * 查询合同打分列表 @@ -45,6 +44,7 @@ */ @Override public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) { contractScore.setUnitId(Long.valueOf(SecurityUtils.getUnitId())); return contractScoreMapper.selectDefaultScoreList(contractScore); }
@@ -22,6 +22,7 @@ import com.ycl.system.Result; import com.ycl.system.page.PageUtil; import com.ycl.utils.DateUtils; import com.ycl.utils.SecurityUtils; import com.ycl.utils.StringUtils; import enumeration.ContractStatus; import enumeration.general.RuleDeductCategoryEnum; @@ -164,6 +165,7 @@ @Override public Result selectAll(ContractQuery query) { IPage<ContractVO> page = PageUtil.getPage(query, ContractVO.class); query.setUnitId(SecurityUtils.getUnitId()); baseMapper.getPage(page, query); page.getRecords().stream().forEach(contract -> { Date now = new Date(); ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -464,6 +464,7 @@ @Override public Result page(WorkOrderQuery query) { IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class); query.setUnitId(SecurityUtils.getUnitId()); baseMapper.page(page, query); if (! CollectionUtils.isEmpty(page.getRecords())) { page.getRecords().stream().forEach(item -> { ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -40,6 +40,9 @@ <if test="query.unitName != null and query.unitName != '' "> AND tyu.unit_name like concat('%', #{query.unitName}, '%') </if> <if test="query.unitId != null"> AND tyu.id = #{query.unitId} </if> </where> </select>
@@ -17,6 +17,9 @@ from t_contract a left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0 where a.deleted = 0 <if test="query.unitId != null"> and a.unit_id = #{query.unitId} </if> <if test="query.name != null and query.name != ''"> and a.name like concat('%', #{query.name}, '%') </if> ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -42,13 +42,16 @@ t_work_order wo INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0 INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if> LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0 LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0 WHERE wo.deleted = 0 <if test="query.unitId != null"> AND wo.unit_id = #{query.unitId} </if> <if test="query.workOrderNo != null and query.workOrderNo != ''"> AND wo.work_order_no = #{query.workOrderNo} </if> @@ -87,7 +90,7 @@ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if> LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0 INNER JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0 LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0 LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0 LEFT JOIN sys_user su ON su.user_id = odr.user_id
