diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java b/cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java index 5cffbca0cc657b4bb41fc3164349ff9fac2b1c59..c9eb77064d49477fa4fea7d281d08a4719bf1f90 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java @@ -46,6 +46,7 @@ public class EntrustController { @ApiOperation(value = "委托分页列表") @ApiImplicitParams(value = { + @ApiImplicitParam(name = "entrustCode", value = "委托å•å·", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "endDate", value = "结æŸæ—¥æœŸ", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "status", @@ -59,10 +60,10 @@ public class EntrustController { @ApiImplicitParam(name = "isUrgent", value = "(1åŠ æ€¥ï¼Œ0ä¸åŠ 急)", paramType = "query", dataType = "Integer") }) @GetMapping("/getPage") - public BaseResponse getPage(PageQuery pageQuery, String startDate, String endDate, Integer status, + public BaseResponse getPage(PageQuery pageQuery, String entrustCode, String startDate, String endDate, Integer status, String clientName, String projectName, String projectCode, Integer isUrgent) { try { - return entrustService.getPage(pageQuery, startDate, endDate, status, clientName, projectName, projectCode, isUrgent); + return entrustService.getPage(pageQuery, entrustCode, startDate, endDate, status, clientName, projectName, projectCode, isUrgent); } catch (Exception e) { log.debug("委托分页列表{}", e); } diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml b/cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml index f2ff1e7181c99e244048ca2ae3497e8cb1184069..d753c0d9795e5b7ded8157dca50dfad223b011bc 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml @@ -5,6 +5,9 @@ <sql id="where"> <where> and e.is_delete = 1 + <if test="params.entrustCode != null and params.entrustCode != ''"> + and e.entrust_code like concat('%', #{params.entrustCode}, '%') + </if> <if test="params.startDate != null and params.startDate != ''"> and DATE(e.entrust_date) >= #{params.startDate} </if> @@ -149,12 +152,13 @@ END ) as statusValue, p.id as projectId, p.name as projectName, p.code as projectCode, - su.name as userName, e.is_urgent as isUrgent + su.name as userName, e.is_urgent as isUrgent,c.name as clientName from sample_handle t left join sys_user su on su.id = t.user_id left join sample s on s.id = t.sample_id left join entrust e on e.id = s.entrust_id left join project p on p.id = e.project_id + left join client c on c.id = e.client_id where 1=1 <if test="params.userId != null"> and t.user_id = #{params.userId} @@ -185,12 +189,13 @@ END ) as statusValue, p.id as projectId, p.name as projectName, p.code as projectCode, - su.name as userName, e.is_urgent as isUrgent + su.name as userName, e.is_urgent as isUrgent, c.name as clientName from sample_distribution t left join sys_user su on su.id = t.user_id left join sample s on s.id = t.sample_id left join entrust e on e.id = s.entrust_id left join project p on p.id = e.project_id + left join client c on c.id = e.client_id where 1=1 <if test="params.userId != null"> and t.user_id = #{params.userId} diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java b/cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java index 0e3c932a9a8dc5234996173db2b315e4de1e1268..174b669021e632cf451264a34fc51e6dc9ed604d 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java @@ -28,7 +28,7 @@ import java.util.Map; */ public interface IEntrustService extends IService<Entrust> { - BaseResponse<IPage<EntrustVo>> getPage(PageQuery pageQuery, String startDate, String endDate, Integer status, + BaseResponse<IPage<EntrustVo>> getPage(PageQuery pageQuery, String entrustCode, String startDate, String endDate, Integer status, String clientName, String projectName, String projectCode, Integer isUrgent); BaseResponse<String> setTopping(Integer id); diff --git a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java index 7488878517c45fb4a1c87d522874615cb0517225..55973adddb1ff48d45d103d53061730b54c1c711 100644 --- a/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java +++ b/cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java @@ -140,13 +140,14 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl * @return */ @Override - public BaseResponse<IPage<EntrustVo>> getPage(PageQuery pageQuery, String startDate, String endDate, Integer status, + public BaseResponse<IPage<EntrustVo>> getPage(PageQuery pageQuery, String entrustCode, String startDate, String endDate, Integer status, String clientName, String projectName, String projectCode, Integer isUrgent) { LoginUser loginUser = userService.getLoginUser(); if (loginUser == null) { return BaseResponse.errorMsg("请登录账å·"); } Map<String, Object> params = new HashMap<>(); + params.put("entrustCode", entrustCode); params.put("startDate", startDate); params.put("endDate", endDate); params.put("status", status);