ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
@@ -27,7 +27,7 @@ * 规则名称 */ @ExcelProperty({"自贡市公共视频监控系统续维合同", "规则名称"}) @ColumnWidth(40) @ColumnWidth(130) private String ruleName; /** ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
@@ -45,8 +45,8 @@ */ @PreAuthorize("@ss.hasPermi('system:result:query')") @GetMapping("/record/list") public TableDataInfo recordList(Long resultId) { List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId); public TableDataInfo recordList(Long resultId, Long contractId) { List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId, contractId); return getDataTable(list); }
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.platform.domain.entity.ContractResult; import com.ycl.platform.domain.entity.ContractResultRecord; import com.ycl.platform.domain.vo.ContractResultVO; import java.util.List; @@ -13,5 +14,9 @@ * @date 2024-04-01 */ public interface ContractResultMapper extends BaseMapper<ContractResult> { List<ContractResultVO> selectCheckResultList(ContractResultVO checkResult); List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId); } ycl-server/src/main/java/com/ycl/platform/service/IContractResultService.java
@@ -72,9 +72,10 @@ /** * 根据考核结果查询记录 * @param resultId 考核结果id * @param contractId 合同id * @return 考核结果记录 */ List<ContractResultRecord> selectCheckResultRecordList(Long resultId); List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId); Boolean publish(Long id); } ycl-server/src/main/java/com/ycl/platform/service/impl/ContractResultServiceImpl.java
@@ -1,6 +1,5 @@ package com.ycl.platform.service.impl; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.domain.entity.ContractResult; @@ -9,8 +8,6 @@ import com.ycl.platform.mapper.ContractResultMapper; import com.ycl.platform.mapper.ContractResultRecordMapper; import com.ycl.platform.service.IContractResultService; import com.ycl.platform.service.ITContractService; import com.ycl.platform.service.YwUnitService; import com.ycl.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -108,10 +105,8 @@ } @Override public List<ContractResultRecord> selectCheckResultRecordList(Long resultId) { return new LambdaQueryChainWrapper<>(contractResultRecordMapper) .eq(ContractResultRecord::getResultId, resultId) .list(); public List<ContractResultRecord> selectCheckResultRecordList(Long resultId, Long contractId) { return checkResultMapper.selectCheckResultRecordList(resultId, contractId); } @Override ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
@@ -24,4 +24,15 @@ AND c.publish = #{publish} </if> </select> <select id="selectCheckResultRecordList" resultType="com.ycl.platform.domain.entity.ContractResultRecord"> SELECT a.rule_name, COUNT(b.id) AS num, IFNULL(-SUM(score), 0) AS score FROM t_calculate_rule a LEFT JOIN t_contract_result_record b ON SUBSTRING_INDEX(b.rule_ids, ',', -1) = a.id AND b.deleted = 0 AND b.result_id = #{resultId} WHERE a.contract_id = #{contractId} AND a.deleted = 0 GROUP BY a.rule_name </select> </mapper>
