From 762fc918f2b3a33029b737621163f2dd0dd973d6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 27 Jun 2024 09:26:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93-=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsConformityAssessmentController.java | 22 +++++++++++++++++++ .../LawsEvaluationNotMetController.java | 6 ----- ...LawsConformityAssessmentLibraryDetail.java | 14 +++++++++++- .../entity/LawsEvaluationNotMetLibrary.java | 2 +- ...LawsConformityAssessmentLibraryMapper.java | 4 ++++ .../LawsConformityAssessmentLibraryMapper.xml | 9 ++++++++ ...awsConformityAssessmentLibraryService.java | 17 ++++++++++++++ ...onformityAssessmentLibraryServiceImpl.java | 22 +++++++++++++++++++ ...awsEvaluationNotMetLibraryServiceImpl.java | 2 -- 9 files changed, 88 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java index d70db001..ae32d6ad 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsConformityAssessmentController.java @@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -46,4 +47,25 @@ public class LawsConformityAssessmentController { return Result.OK(pageList); } + /** + * 查看 + * + * @param lawsConformityAssessmentLibraryDetail + * @param pageNo + * @param pageSize + * @return + */ + @AutoLog(value = "法规符合性评估库-法规符合性评估库-查看") + @ApiOperation(value = "法规符合性评估库-法规符合性评估库-查看", notes = "法规符合性评估库-法规符合性评估库-查看") + @GetMapping(value = "/detail") + @ApiOperationSupport(order = 1) + @RequiresPermissions("lawsConformityAssessment:detail") + public Result> detail(LawsConformityAssessmentLibraryDetail lawsConformityAssessmentLibraryDetail, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = lawsConformityAssessmentLibraryService + .detail(lawsConformityAssessmentLibraryDetail, pageNo, pageSize); + return Result.OK(pageList); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java index b8bf6bc6..208d5bc5 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/controller/LawsEvaluationNotMetController.java @@ -51,12 +51,6 @@ public class LawsEvaluationNotMetController extends JeroController> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, LawsEvaluationNotMetLibrary lawsEvaluationNotMet, HttpServletRequest req) { - if (pageNo == null) { - pageNo = 1; - } - if (pageSize == null) { - pageSize = 10; - } IPage pageList = lawsEvaluationNotMetLibraryService.queryPage(lawsEvaluationNotMet, pageNo, pageSize, req); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java index 90656368..7847da74 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibraryDetail.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,6 +18,7 @@ import lombok.Data; @TableName(value ="laws_conformity_assessment_library_detail") @Data public class LawsConformityAssessmentLibraryDetail implements Serializable { + /** * 主键ID */ @@ -76,19 +78,22 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable { * 车型状态 */ @ApiModelProperty(value = "车型状态") + @Dict(dicCode = "model_status") private String modelStatus; /** * 责任部门 */ @ApiModelProperty(value = "责任部门") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String authDept; /** * 评估人 */ @ApiModelProperty(value = "评估人") - private String userId; + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + private String assessor; /** * 评估结果 @@ -142,8 +147,15 @@ public class LawsConformityAssessmentLibraryDetail implements Serializable { * 佐证材料 */ @ApiModelProperty(value = "佐证材料") + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") private String material; + /** + * 关联主表Id + */ + @ApiModelProperty(value = "关联主表Id") + private String bindId; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index 2fcff025..bf528520 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -107,7 +107,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "评估人") @Excel(name = "评估人", width = 15, orderNum = "8", dictTable = "sys_user", dicCode = "id", dicText = "realname") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") - private String userId; + private String assessor; /** * 评估结果 diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java index fa5a2682..4c586aa0 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/LawsConformityAssessmentLibraryMapper.java @@ -1,10 +1,12 @@ package com.jero.modules.assessmentLibrary.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; import org.apache.ibatis.annotations.Param; /** @@ -16,6 +18,8 @@ import org.apache.ibatis.annotations.Param; public interface LawsConformityAssessmentLibraryMapper extends BaseMapper { Page queryByPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + Page detail(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml index 40d6c57f..94337760 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/mapper/xml/LawsConformityAssessmentLibraryMapper.xml @@ -30,4 +30,13 @@ left join laws_domestic_standard as d on d.id = cs.standard_id ${ew.customSqlSegment} + + diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java index 89da93b9..e1120ea3 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/ILawsConformityAssessmentLibraryService.java @@ -3,6 +3,7 @@ package com.jero.modules.assessmentLibrary.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; /** * @author ThinkBook @@ -11,5 +12,21 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ILawsConformityAssessmentLibraryService extends IService { + /** + * 分页列表 + * @param lawsConformityAssessmentLibrary + * @param pageNo + * @param pageSize + * @return + */ IPage queryPage(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary, Integer pageNo, Integer pageSize); + + /** + * 查看 分页列表 + * @param lawsConformityAssessmentLibraryDetail + * @param pageNo + * @param pageSize + * @return + */ + IPage detail(LawsConformityAssessmentLibraryDetail lawsConformityAssessmentLibraryDetail, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java index 997f5565..66cf2e7a 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java @@ -1,10 +1,12 @@ package com.jero.modules.assessmentLibrary.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibrary; +import com.jero.modules.assessmentLibrary.entity.LawsConformityAssessmentLibraryDetail; import com.jero.modules.assessmentLibrary.service.ILawsConformityAssessmentLibraryService; import com.jero.modules.assessmentLibrary.mapper.LawsConformityAssessmentLibraryMapper; import lombok.extern.slf4j.Slf4j; @@ -49,6 +51,26 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl result = lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper); return result; } + + @Override + public IPage detail(LawsConformityAssessmentLibraryDetail lawsConformityAssessmentLibraryDetail, Integer pageNo, Integer pageSize) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + Page page = new Page<>(pageNo, pageSize); + queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getBindId()), + "bind_id", lawsConformityAssessmentLibraryDetail.getBindId()); + queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getTermNumber()), + "term_number", lawsConformityAssessmentLibraryDetail.getTermNumber()); + queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getModel()), + "model", lawsConformityAssessmentLibraryDetail.getModel()); + queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getResult()), + "result", lawsConformityAssessmentLibraryDetail.getResult()); + if (StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAuthDept())) { + queryWrapper.in("auth_dept", Arrays.asList(lawsConformityAssessmentLibraryDetail.getAuthDept().split(","))); + } + queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibraryDetail.getAssessor()), + "CONCAT(u.realname, '(', u.username, ')')", lawsConformityAssessmentLibraryDetail.getAssessor()); + return lawsConformityAssessmentLibraryMapper.detail(page, queryWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index 71d5e0c0..7721cee9 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -11,10 +11,8 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.modules.assessmentLibrary.entity.LawsEvaluationNotMetLibrary; import com.jero.modules.assessmentLibrary.mapper.LawsEvaluationNotMetLibraryMapper; import com.jero.modules.assessmentLibrary.service.ILawsEvaluationNotMetLibraryService; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo; import com.jero.modules.projectLibrary.common.AssessCommon; import lombok.extern.slf4j.Slf4j; -import org.apache.catalina.connector.Request; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jeecgframework.poi.excel.ExcelExportUtil;