From 45df7f2e0bf7e97f53694d92b0e3caaba0fa09b3 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 24 Jun 2024 19:24:21 +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=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsConformityAssessmentController.java | 2 +- .../LawsEvaluationNotMetController.java | 5 +++-- .../entity/LawsConformityAssessmentLibrary.java | 4 ++++ .../LawsConformityAssessmentLibraryMapper.java | 4 +++- .../LawsConformityAssessmentLibraryMapper.xml | 2 +- ...wsConformityAssessmentLibraryServiceImpl.java | 2 +- .../mapper/xml/LawsEvaluationNotMetMapper.xml | 8 +------- .../impl/LawsEvaluationNotMetServiceImpl.java | 16 ++++++++-------- 8 files changed, 22 insertions(+), 21 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 ae5ca6ed..a91f1c85 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 @@ -17,7 +17,7 @@ import javax.annotation.Resource; @Api(tags = "法规符合性评估库-法规符合性评估库") @RestController -@RequestMapping("/laws/lawsConformityAssessment") +@RequestMapping("/assessment/lawsConformityAssessment") @Slf4j public class LawsConformityAssessmentController { 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 9d9862e1..46c39593 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 @@ -34,16 +34,17 @@ import java.util.List; */ @Api(tags="未符合项") @RestController -@RequestMapping("/projectLibrary/lawsEvaluationNotMet") +@RequestMapping("/assessment/lawsEvaluationNotMet") @Slf4j public class LawsEvaluationNotMetController extends JeroController { + @Autowired private ILawsEvaluationNotMetService lawsEvaluationNotMetService; /** * 分页列表查询 */ - @RequiresPermissions(value = {"inconformityItem:search","vehicleItemLibrary:detail:noMatchItemDetail"}) +// @RequiresPermissions(value = {"inconformityItem:search","vehicleItemLibrary:detail:noMatchItemDetail"}) @AutoLog(value = "未符合项-分页列表查询") @ApiOperation(value="未符合项-分页列表查询", notes="未符合项-分页列表查询") @GetMapping(value = "/page") diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java index 401dcfb4..0b30faa6 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java @@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * 法规符合性评估库 @@ -39,6 +41,8 @@ public class LawsConformityAssessmentLibrary implements Serializable { * 评估日期 */ @ApiModelProperty(value = "评估日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date valuationTime; /** 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 5194a3c8..fa5a2682 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,9 +1,11 @@ package com.jero.modules.assessmentLibrary.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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 org.apache.ibatis.annotations.Param; /** * @author ThinkBook @@ -13,7 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface LawsConformityAssessmentLibraryMapper extends BaseMapper { - Page queryByPage(Page page, QueryWrapper queryWrapper); + Page queryByPage(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 701f09c8..838b3d89 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 @@ -2,7 +2,7 @@ - + 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 61f6f603..cd2bcb99 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 @@ -42,7 +42,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl result = lawsConformityAssessmentLibraryMapper.queryByPage(page, queryWrapper); return result; } diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsEvaluationNotMetMapper.xml b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsEvaluationNotMetMapper.xml index 37ddf416..4593bcc7 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsEvaluationNotMetMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/mapper/xml/LawsEvaluationNotMetMapper.xml @@ -31,13 +31,7 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java index ee1cf866..0e42b3c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsEvaluationNotMetServiceImpl.java @@ -62,14 +62,14 @@ public class LawsEvaluationNotMetServiceImpl extends ServiceImpl queryPage(LawsEvaluationNotMet lawsEvaluationNotMet, Integer pageNo, Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsEvaluationNotMet, req.getParameterMap()); - String engineerName = lawsEvaluationNotMet.getEngineerName(); - if (StringUtils.isNotBlank(engineerName)){ - queryWrapper.like("su.realname",engineerName); - } - String workNumber = lawsEvaluationNotMet.getWorkNumber(); - if (StringUtils.isNotBlank(workNumber)){ - queryWrapper.like("lpl.work_number",workNumber); - } +// String engineerName = lawsEvaluationNotMet.getEngineerName(); +// if (StringUtils.isNotBlank(engineerName)){ +// queryWrapper.like("su.realname",engineerName); +// } +// String workNumber = lawsEvaluationNotMet.getWorkNumber(); +// if (StringUtils.isNotBlank(workNumber)){ +// queryWrapper.like("lpl.work_number",workNumber); +// } Page page = new Page<>(pageNo, pageSize); return notMetMapper.pageList(page,queryWrapper,lawsEvaluationNotMet); }