From 6b1077a1cb9f1fe09a8e1e92db23ffa840ddc478 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 07 三月 2024 15:33:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java | 60 +++++ ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java | 52 ++++ ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml | 52 ++++ ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java | 41 +++ ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java | 82 ++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java | 62 +++++ ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java | 73 ++++++ ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java | 154 ++++++++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java | 61 +++++ ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java | 29 ++ 10 files changed, 666 insertions(+), 0 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java new file mode 100644 index 0000000..8c265eb --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckResult.java @@ -0,0 +1,52 @@ +package com.ycl.platform.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import com.ycl.platform.base.AbsEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 鑰冩牳缁撴灉 + * + * @author xp + * @since 2024-03-07 + */ +@Data +@Accessors(chain = true) +@TableName("t_check_result") +@ApiModel(value = "CheckResult瀵硅薄", description = "鑰冩牳缁撴灉") +public class CheckResult extends AbsEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("鑰冩牳瀵硅薄") + @TableField("check_unit_id") + private Integer checkUnitId; + + @ApiModelProperty("鑰冩牳鍙戝竷") + @TableField("check_publish_id") + private Integer checkPublishId; + + @ApiModelProperty("鏈�缁堝垎鏁�") + @TableField("check_score") + private BigDecimal checkScore; + + @ApiModelProperty("绯荤粺鎵撳垎") + @TableField("system_score") + private BigDecimal systemScore; + + @ApiModelProperty("浜哄伐鎵撳垎") + @TableField("manual_score") + private BigDecimal manualScore; + + @ApiModelProperty("鑰冩牳鏃堕棿") + @TableField("check_time") + private LocalDateTime checkTime; + + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java new file mode 100644 index 0000000..a95fae8 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckResultForm.java @@ -0,0 +1,62 @@ +package com.ycl.platform.domain.form; + +import com.ycl.system.domain.group.Update; +import com.ycl.system.domain.group.Add; +import com.ycl.platform.base.AbsForm; +import com.ycl.platform.domain.entity.CheckResult; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import org.springframework.beans.BeanUtils; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import org.springframework.lang.NonNull; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 鑰冩牳缁撴灉琛ㄥ崟 + * + * @author xp + * @since 2024-03-07 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "CheckResult琛ㄥ崟", description = "鑰冩牳缁撴灉琛ㄥ崟") +public class CheckResultForm extends AbsForm { + + @NotNull(message = "鑰冩牳瀵硅薄涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("鑰冩牳瀵硅薄") + private Integer checkUnitId; + + @NotNull(message = "鑰冩牳鍙戝竷涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("鑰冩牳鍙戝竷") + private Integer checkPublishId; + + @NotNull(message = "鏈�缁堝垎鏁颁笉鑳戒负绌�", groups = {Add.class, Update.class}) + @ApiModelProperty("鏈�缁堝垎鏁�") + private BigDecimal checkScore; + + @NotNull(message = "绯荤粺鎵撳垎涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("绯荤粺鎵撳垎") + private BigDecimal systemScore; + + @NotNull(message = "浜哄伐鎵撳垎涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("浜哄伐鎵撳垎") + private BigDecimal manualScore; + + @NotNull(message = "鑰冩牳鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("鑰冩牳鏃堕棿") + private LocalDateTime checkTime; + + public static CheckResult getEntityByForm(@NonNull CheckResultForm form, CheckResult entity) { + if(entity == null) { + entity = new CheckResult(); + } + BeanUtils.copyProperties(form, entity); + return entity; + } + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java new file mode 100644 index 0000000..4472c7f --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ManualScoreForm.java @@ -0,0 +1,41 @@ +package com.ycl.platform.domain.form; + +import com.ycl.platform.base.AbsForm; +import com.ycl.platform.domain.entity.CheckResult; +import com.ycl.system.domain.group.Add; +import com.ycl.system.domain.group.Update; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.beans.BeanUtils; +import org.springframework.lang.NonNull; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 浜哄伐鎵撳垎琛ㄥ崟 + * + * @author xp + * @since 2024-03-07 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "CheckResult琛ㄥ崟", description = "浜哄伐鎵撳垎琛ㄥ崟") +public class ManualScoreForm extends AbsForm { + + @NotNull(message = "浜哄伐鎵撳垎涓嶈兘涓虹┖", groups = {Add.class, Update.class}) + @ApiModelProperty("浜哄伐鎵撳垎") + private BigDecimal manualScore; + + public static CheckResult getEntityByForm(@NonNull ManualScoreForm form, CheckResult entity) { + if(entity == null) { + entity = new CheckResult(); + } + BeanUtils.copyProperties(form, entity); + return entity; + } + +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java new file mode 100644 index 0000000..0e6fb6e --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckResultQuery.java @@ -0,0 +1,60 @@ +package com.ycl.platform.domain.query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ycl.platform.base.AbsQuery; + +import java.util.Date; +import java.util.List; +import java.util.Objects; + +import org.springframework.lang.NonNull; +import jakarta.validation.constraints.NotBlank; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import utils.DateUtils; + +/** + * 鑰冩牳缁撴灉鏌ヨ + * + * @author xp + * @since 2024-03-07 + */ +@Data +@Accessors(chain = true) +@ApiModel(value = "CheckResult鏌ヨ", description = "鑰冩牳缁撴灉鏌ヨ") +public class CheckResultQuery extends AbsQuery { + + /** + * 鑰冩牳瀵硅薄 + */ + private String checkUnitName; + + /** + * 鑰冩牳棰戠巼 + */ + private String frequency; + + /** + * 鑰冩牳鑼冨洿 + */ + private String examineRange; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date start; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date end; + + public void setTime() { + if (Objects.nonNull(start)) { + start = DateUtils.getDayStart(start); + } + if (Objects.nonNull(end)) { + end = DateUtils.getDayEnd(end); + } + } + +} + diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java new file mode 100644 index 0000000..8193294 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckResultVO.java @@ -0,0 +1,61 @@ +package com.ycl.platform.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ycl.platform.base.AbsVo; +import com.ycl.platform.domain.entity.CheckResult; + +import java.math.BigDecimal; +import java.util.List; +import java.time.LocalDateTime; +import org.springframework.lang.NonNull; +import org.springframework.beans.BeanUtils; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 鑰冩牳缁撴灉灞曠ず + * + * @author xp + * @since 2024-03-07 + */ +@Data +@Accessors(chain = true) +public class CheckResultVO extends AbsVo { + + /** 鑰冩牳瀵硅薄 */ + private Integer checkUnitId; + private String checkUnitName; + + /** 鑰冩牳 */ + private String examineName; + + /** 鑰冩牳棰戠巼 */ + private String frequency; + + /** 鑰冩牳鑼冨洿 */ + private String examineRange; + + /** 鏈�缁堝垎鏁� */ + private BigDecimal checkScore; + + /** 绯荤粺鎵撳垎 */ + private BigDecimal systemScore; + + /** 浜哄伐鎵撳垎 */ + private BigDecimal manualScore; + + /** 鑰冩牳鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime checkTime; + + public static CheckResultVO getVoByEntity(@NonNull CheckResult entity, CheckResultVO vo) { + if(vo == null) { + vo = new CheckResultVO(); + } + BeanUtils.copyProperties(entity, vo); + return vo; + } + +} diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java new file mode 100644 index 0000000..3c8fa6d --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java @@ -0,0 +1,82 @@ +package com.ycl.platform.controller; + +import com.ycl.platform.domain.form.ManualScoreForm; +import com.ycl.system.domain.group.Update; +import com.ycl.system.domain.group.Add; +import org.springframework.validation.annotation.Validated; +import lombok.RequiredArgsConstructor; +import java.util.List; +import org.springframework.validation.annotation.Validated; +import jakarta.validation.constraints.NotEmpty; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.ycl.platform.service.CheckResultService; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.CheckResultForm; +import com.ycl.platform.domain.query.CheckResultQuery; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +/** + * 鑰冩牳缁撴灉 鍓嶇鎺у埗鍣� + * + * @author xp + * @since 2024-03-07 + */ +@Validated +@RequiredArgsConstructor +@Api(value = "鑰冩牳缁撴灉", tags = "鑰冩牳缁撴灉绠$悊") +@RestController +@RequestMapping("/check-result") +public class CheckResultController { + + private final CheckResultService checkResultService; + + @PostMapping + @ApiOperation(value = "娣诲姞", notes = "娣诲姞") + public Result add(@RequestBody @Validated(Add.class) CheckResultForm form) { + return checkResultService.add(form); + } + + @PutMapping + @ApiOperation(value = "淇敼", notes = "淇敼") + public Result update(@RequestBody @Validated(Update.class) CheckResultForm form) { + return checkResultService.update(form); + } + + @DeleteMapping("/{id}") + @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎") + public Result removeById(@PathVariable("id") String id) { + return checkResultService.removeById(id); + } + + @DeleteMapping("/batch") + @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎") + public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) { + return checkResultService.remove(ids); + } + + @PostMapping("/page") + @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉") + public Result page(@RequestBody CheckResultQuery query) { + return checkResultService.page(query); + } + + @GetMapping("/{id}") + @ApiOperation(value = "璇︽儏", notes = "璇︽儏") + public Result detail(@PathVariable("id") String id) { + return checkResultService.detail(id); + } + + @GetMapping("/list") + @ApiOperation(value = "鍒楄〃", notes = "鍒楄〃") + public Result list() { + return checkResultService.all(); + } + + @PostMapping("/manual-score") + @ApiOperation(value = "浜哄伐鎵撳垎", notes = "浜哄伐鎵撳垎") + public Result manualScore(@RequestBody ManualScoreForm form) { + return checkResultService.manualScore(form); + } +} diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java new file mode 100644 index 0000000..9b3228d --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckResultMapper.java @@ -0,0 +1,29 @@ +package com.ycl.platform.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ycl.platform.domain.entity.CheckResult; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.platform.domain.query.CheckResultQuery; +import com.ycl.platform.domain.vo.CheckResultVO; +import com.ycl.platform.domain.form.CheckResultForm; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 鑰冩牳缁撴灉 Mapper 鎺ュ彛 + * + * @author xp + * @since 2024-03-07 + */ +@Mapper +public interface CheckResultMapper extends BaseMapper<CheckResult> { + + /** + * 鍒嗛〉 + * @param page + * @param query + */ + Page page(IPage page, @Param("query") CheckResultQuery query); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java b/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java new file mode 100644 index 0000000..b605bd8 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/CheckResultService.java @@ -0,0 +1,73 @@ +package com.ycl.platform.service; + +import com.ycl.platform.domain.entity.CheckResult; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.platform.domain.form.ManualScoreForm; +import com.ycl.system.Result; +import com.ycl.platform.domain.form.CheckResultForm; +import com.ycl.platform.domain.query.CheckResultQuery; +import java.util.List; + +/** + * 鑰冩牳缁撴灉 鏈嶅姟绫� + * + * @author xp + * @since 2024-03-07 + */ +public interface CheckResultService extends IService<CheckResult> { + + /** + * 娣诲姞 + * @param form + * @return + */ + Result add(CheckResultForm form); + + /** + * 淇敼 + * @param form + * @return + */ + Result update(CheckResultForm form); + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + Result remove(List<String> ids); + + /** + * id鍒犻櫎 + * @param id + * @return + */ + Result removeById(String id); + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + Result page(CheckResultQuery query); + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + Result detail(String id); + + /** + * 鍒楄〃 + * @return + */ + Result all(); + + /** + * 浜哄伐鎵撳垎 + * @param form + * @return + */ + Result manualScore(ManualScoreForm form); +} diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java new file mode 100644 index 0000000..7bd7801 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckResultServiceImpl.java @@ -0,0 +1,154 @@ +package com.ycl.platform.service.impl; + +import com.ycl.exception.ServiceException; +import com.ycl.platform.domain.entity.CheckResult; +import com.ycl.platform.domain.form.ManualScoreForm; +import com.ycl.platform.mapper.CheckResultMapper; +import com.ycl.platform.service.CheckResultService; +import com.ycl.system.Result; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.platform.domain.form.CheckResultForm; +import com.ycl.platform.domain.vo.CheckResultVO; +import com.ycl.platform.domain.query.CheckResultQuery; +import java.util.List; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.system.page.PageUtil; +import org.springframework.stereotype.Service; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; +import java.util.ArrayList; +import java.util.Objects; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import lombok.RequiredArgsConstructor; +import org.springframework.util.StringUtils; + +/** + * 鑰冩牳缁撴灉 鏈嶅姟瀹炵幇绫� + * + * @author xp + * @since 2024-03-07 + */ +@Service +@RequiredArgsConstructor +public class CheckResultServiceImpl extends ServiceImpl<CheckResultMapper, CheckResult> implements CheckResultService { + + private final CheckResultMapper checkResultMapper; + + /** + * 娣诲姞 + * @param form + * @return + */ + @Override + public Result add(CheckResultForm form) { + CheckResult entity = CheckResultForm.getEntityByForm(form, null); + if(baseMapper.insert(entity) > 0) { + return Result.ok("娣诲姞鎴愬姛"); + } + return Result.error("娣诲姞澶辫触"); + } + + /** + * 淇敼 + * @param form + * @return + */ + @Override + public Result update(CheckResultForm form) { + + CheckResult entity = baseMapper.selectById(form.getId()); + + // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊 + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + BeanUtils.copyProperties(form, entity); + if (baseMapper.updateById(entity) > 0) { + return Result.ok("淇敼鎴愬姛"); + } + return Result.error("淇敼澶辫触"); + } + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + @Override + public Result remove(List<String> ids) { + if(baseMapper.deleteBatchIds(ids) > 0) { + return Result.ok("鍒犻櫎鎴愬姛"); + } + return Result.error("鍒犻櫎澶辫触"); + } + + /** + * id鍒犻櫎 + * @param id + * @return + */ + @Override + public Result removeById(String id) { + if(baseMapper.deleteById(id) > 0) { + return Result.ok("鍒犻櫎鎴愬姛"); + } + return Result.error("鍒犻櫎澶辫触"); + } + + /** + * 鍒嗛〉鏌ヨ + * @param query + * @return + */ + @Override + public Result page(CheckResultQuery query) { + query.setTime(); + IPage page = PageUtil.getPage(query, CheckResult.class); + baseMapper.page(page, query); + return Result.ok().data(page.getRecords()).total(page.getTotal()); + } + + /** + * 鏍规嵁id鏌ユ壘 + * @param id + * @return + */ + @Override + public Result detail(String id) { + + CheckResult entity = baseMapper.selectById(id); + Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); + CheckResultVO vo = CheckResultVO.getVoByEntity(entity, null); + return Result.ok().data(vo); + } + + /** + * 鍒楄〃 + * @return + */ + @Override + public Result all() { + List<CheckResult> entities = baseMapper.selectList(null); + List<CheckResultVO> vos = entities.stream() + .map( + entity -> CheckResultVO.getVoByEntity(entity, null) + ) + .collect(Collectors.toList()); + return Result.ok().data(vos); + } + + @Override + public Result manualScore(ManualScoreForm form) { + CheckResult checkResult = baseMapper.selectById(form.getId()); + if (Objects.isNull(checkResult)) { + throw new ServiceException("鑰冩牳缁撴灉涓嶅瓨鍦�"); + } + checkResult.setManualScore(form.getManualScore()); + checkResult.setCheckScore(form.getManualScore().add(checkResult.getSystemScore())); + baseMapper.updateById(checkResult); + return Result.ok(); + } +} diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml new file mode 100644 index 0000000..1d4ff80 --- /dev/null +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckResultMapper.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.ycl.platform.mapper.CheckResultMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.CheckResultVO"> + <result column="id" property="id" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="unit_name" property="checkUnitName" /> + <result column="examine_name" property="examineName" /> + <result column="check_score" property="checkScore" /> + <result column="system_score" property="systemScore" /> + <result column="manual_score" property="manualScore" /> + <result column="check_time" property="checkTime" /> + <result column="frequency" property="frequency" /> + <result column="examine_range" property="examineRange" /> + </resultMap> + + <select id="page" resultMap="BaseResultMap"> + SELECT + tcr.id, + tyu.unit_name, + tcp.examine_name, + tcp.examine_range, + tcp.frequency, + tcr.check_time, + tcr.check_score, + tcr.system_score, + tcr.manual_score + FROM + t_check_result tcr + INNER JOIN t_check_publish tcp ON tcr.check_publish_id = tcp.id + INNER JOIN t_yw_unit tyu ON tcr.check_unit_id = tyu.id + <where> + AND tcr.deleted = 0 + <if test="query.checkUnitName != null and query.checkUnitName != ''"> + AND tyu.unit_name like concat('%', #{query.checkUnitName}, '%') + </if> + <if test="query.frequency != null and query.frequency != ''"> + AND tcp.frequency = #{query.frequency} + </if> + <if test="query.frequency != null and query.frequency != ''"> + AND tcp.examine_range = #{query.examineRange} + </if> + <if test="query.start != null and query.end != null"> + AND tcr.check_time BETWEEN #{query.start} AND #{query.end} + </if> + </where> + </select> + +</mapper> -- Gitblit v1.8.0