db/430É豸¹ÜÀíÊý¾Ý¿âÉè¼Æ.pdma.json
@@ -4,7 +4,7 @@ "avatar": "", "version": "4.9.2", "createdTime": "2025-3-10 16:38:19", "updatedTime": "2025-7-9 19:20:22", "updatedTime": "2025-7-10 10:43:18", "dbConns": [], "profile": { "default": { @@ -25418,6 +25418,24 @@ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098" }, { "defKey": "order_id", "defName": "å·¥åID", "comment": "", "type": "", "len": "", "scale": "", "primaryKey": false, "notNull": false, "autoIncrement": false, "defaultValue": "", "hideInGraph": false, "refDict": "", "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64", "extProps": {}, "domain": "16120F75-6AA7-4483-868D-F07F511BB081", "id": "237E6137-D268-4FDF-95F1-C20B95DE6F98" }, { "defKey": "item_code", "defName": "åºå·", "comment": "", lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java
@@ -1,6 +1,5 @@ package org.jeecg.modules.eam.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -9,16 +8,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** * @Description: ææ¯ç¶æé´å®å·¥å @@ -37,21 +31,18 @@ /** * å页å表æ¥è¯¢ * * @param eamTechnicalStatusEvaluationOrder * @param query * @param pageNo * @param pageSize * @param req * @return */ @ApiOperation(value="ææ¯ç¶æé´å®å·¥å-å页å表æ¥è¯¢", notes="ææ¯ç¶æé´å®å·¥å-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<?> queryPageList(EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder, public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderQuery query, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrder, req.getParameterMap()); @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { Page<EamTechnicalStatusEvaluationOrder> page = new Page<EamTechnicalStatusEvaluationOrder>(pageNo, pageSize); IPage<EamTechnicalStatusEvaluationOrder> pageList = eamTechnicalStatusEvaluationOrderService.page(page, queryWrapper); IPage<EamTechnicalStatusEvaluationOrder> pageList = eamTechnicalStatusEvaluationOrderService.queryPageList(page, query); return Result.OK(pageList); } @@ -82,34 +73,7 @@ eamTechnicalStatusEvaluationOrderService.updateById(eamTechnicalStatusEvaluationOrder); return Result.OK("ç¼è¾æå!"); } /** * éè¿idå é¤ * * @param id * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥å-éè¿idå é¤") @ApiOperation(value="ææ¯ç¶æé´å®å·¥å-éè¿idå é¤", notes="ææ¯ç¶æé´å®å·¥å-éè¿idå é¤") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name="id",required=true) String id) { eamTechnicalStatusEvaluationOrderService.removeById(id); return Result.OK("å 餿å!"); } /** * æ¹éå é¤ * * @param ids * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥å-æ¹éå é¤") @ApiOperation(value="ææ¯ç¶æé´å®å·¥å-æ¹éå é¤", notes="ææ¯ç¶æé´å®å·¥å-æ¹éå é¤") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.eamTechnicalStatusEvaluationOrderService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éå 餿åï¼"); } /** * éè¿idæ¥è¯¢ @@ -117,35 +81,10 @@ * @param id * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥å-éè¿idæ¥è¯¢") @ApiOperation(value="ææ¯ç¶æé´å®å·¥å-éè¿idæ¥è¯¢", notes="ææ¯ç¶æé´å®å·¥å-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name="id",required=true) String id) { EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder = eamTechnicalStatusEvaluationOrderService.getById(id); return Result.OK(eamTechnicalStatusEvaluationOrder); } /** * 导åºexcel * * @param request * @param eamTechnicalStatusEvaluationOrder */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) { return super.exportXls(request, eamTechnicalStatusEvaluationOrder, EamTechnicalStatusEvaluationOrder.class, "ææ¯ç¶æé´å®å·¥å"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, EamTechnicalStatusEvaluationOrder.class); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java
@@ -1,26 +1,22 @@ package org.jeecg.modules.eam.controller; 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.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; /** /** * @Description: ææ¯ç¶æé´å®å·¥åæç» * @Author: jeecg-boot * @Date: 2025-07-09 @@ -32,120 +28,24 @@ @RequestMapping("/eam/eamTechnicalStatusEvaluationOrderDetail") public class EamTechnicalStatusEvaluationOrderDetailController extends JeecgController<EamTechnicalStatusEvaluationOrderDetail, IEamTechnicalStatusEvaluationOrderDetailService> { @Autowired private IEamTechnicalStatusEvaluationOrderDetailService eamTechnicalStatusEvaluationOrderDetailService; private IEamTechnicalStatusEvaluationOrderDetailService orderDetailService; /** * å页å表æ¥è¯¢ * 䏿¬¡å è½½ * * @param eamTechnicalStatusEvaluationOrderDetail * @param pageNo * @param pageSize * @param req * @param orderId * @return */ @ApiOperation(value="ææ¯ç¶æé´å®å·¥åæç»-å页å表æ¥è¯¢", notes="ææ¯ç¶æé´å®å·¥åæç»-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper<EamTechnicalStatusEvaluationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderDetail, req.getParameterMap()); Page<EamTechnicalStatusEvaluationOrderDetail> page = new Page<EamTechnicalStatusEvaluationOrderDetail>(pageNo, pageSize); IPage<EamTechnicalStatusEvaluationOrderDetail> pageList = eamTechnicalStatusEvaluationOrderDetailService.page(page, queryWrapper); return Result.OK(pageList); } /** * æ·»å * * @param eamTechnicalStatusEvaluationOrderDetail * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥åæç»-æ·»å ") @ApiOperation(value="ææ¯ç¶æé´å®å·¥åæç»-æ·»å ", notes="ææ¯ç¶æé´å®å·¥åæç»-æ·»å ") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) { eamTechnicalStatusEvaluationOrderDetailService.save(eamTechnicalStatusEvaluationOrderDetail); return Result.OK("æ·»å æåï¼"); } /** * ç¼è¾ * * @param eamTechnicalStatusEvaluationOrderDetail * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥åæç»-ç¼è¾") @ApiOperation(value="ææ¯ç¶æé´å®å·¥åæç»-ç¼è¾", notes="ææ¯ç¶æé´å®å·¥åæç»-ç¼è¾") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) { eamTechnicalStatusEvaluationOrderDetailService.updateById(eamTechnicalStatusEvaluationOrderDetail); return Result.OK("ç¼è¾æå!"); } /** * éè¿idå é¤ * * @param id * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥åæç»-éè¿idå é¤") @ApiOperation(value="ææ¯ç¶æé´å®å·¥åæç»-éè¿idå é¤", notes="ææ¯ç¶æé´å®å·¥åæç»-éè¿idå é¤") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name="id",required=true) String id) { eamTechnicalStatusEvaluationOrderDetailService.removeById(id); return Result.OK("å 餿å!"); } /** * æ¹éå é¤ * * @param ids * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥åæç»-æ¹éå é¤") @ApiOperation(value="ææ¯ç¶æé´å®å·¥åæç»-æ¹éå é¤", notes="ææ¯ç¶æé´å®å·¥åæç»-æ¹éå é¤") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.eamTechnicalStatusEvaluationOrderDetailService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("æ¹éå 餿åï¼"); } /** * éè¿idæ¥è¯¢ * * @param id * @return */ @AutoLog(value = "ææ¯ç¶æé´å®å·¥åæç»-éè¿idæ¥è¯¢") @ApiOperation(value="ææ¯ç¶æé´å®å·¥åæç»-éè¿idæ¥è¯¢", notes="ææ¯ç¶æé´å®å·¥åæç»-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name="id",required=true) String id) { EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail = eamTechnicalStatusEvaluationOrderDetailService.getById(id); return Result.OK(eamTechnicalStatusEvaluationOrderDetail); @ApiOperation(value = "ææ¯ç¶æé´å®è§èæç»-ä¸å页å表æ¥è¯¢", notes = "ææ¯ç¶æé´å®è§èæç»-ä¸å页å表æ¥è¯¢") @GetMapping(value = "/queryList") public Result<?> queryList(@RequestParam("orderId") String orderId) { LambdaQueryWrapper<EamTechnicalStatusEvaluationOrderDetail> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(EamTechnicalStatusEvaluationOrderDetail::getOrderId, orderId); queryWrapper.orderByAsc(EamTechnicalStatusEvaluationOrderDetail::getCheckCategory); queryWrapper.orderByAsc(EamTechnicalStatusEvaluationOrderDetail::getItemCode); List<EamTechnicalStatusEvaluationOrderDetail> list = orderDetailService.list(queryWrapper); return Result.OK(list); } /** * 导åºexcel * * @param request * @param eamTechnicalStatusEvaluationOrderDetail */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) { return super.exportXls(request, eamTechnicalStatusEvaluationOrderDetail, EamTechnicalStatusEvaluationOrderDetail.class, "ææ¯ç¶æé´å®å·¥åæç»"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, EamTechnicalStatusEvaluationOrderDetail.class); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
@@ -1,6 +1,7 @@ package org.jeecg.modules.eam.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -130,4 +131,12 @@ /**夿³¨*/ @ApiModelProperty(value = "夿³¨") private String remark; //å表å±ç¤º @TableField(exist = false) private String equipmentCode; @TableField(exist = false) private String equipmentName; @TableField(exist = false) private String equipmentModel; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderDetail.java
@@ -40,6 +40,9 @@ /**æ´æ°æ¶é´*/ @ApiModelProperty(value = "æ´æ°æ¶é´") private Date updateTime; /**å·¥åID*/ @ApiModelProperty(value = "å·¥åID") private String orderId; /**åºå·*/ @ApiModelProperty(value = "åºå·") private Integer itemCode; lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java
@@ -1,10 +1,12 @@ package org.jeecg.modules.eam.mapper; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: ææ¯ç¶æé´å®å·¥å @@ -14,4 +16,11 @@ */ public interface EamTechnicalStatusEvaluationOrderMapper extends BaseMapper<EamTechnicalStatusEvaluationOrder> { /** * å页æ¥è¯¢ * @param page * @param queryWrapper * @return */ IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, @Param(Constants.WRAPPER) QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml
@@ -1,5 +1,11 @@ <?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="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper"> <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder"> select ems.*, e.equipment_code, e.equipment_name, e.equipment_model from eam_technical_status_evaluation_order ems inner join eam_equipment e on ems.equipment_id = e.id ${ew.customSqlSegment} </select> </mapper> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationOrderQuery.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ package org.jeecg.modules.eam.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @Data public class EamTechnicalStatusEvaluationOrderQuery { private String orderNum; private String equipmentId; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date dateBegin; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date dateEnd; private String evaluationStatus; private String column; private String order; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java
@@ -1,7 +1,10 @@ package org.jeecg.modules.eam.service; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery; /** * @Description: ææ¯ç¶æé´å®å·¥å @@ -11,4 +14,11 @@ */ public interface IEamTechnicalStatusEvaluationOrderService extends IService<EamTechnicalStatusEvaluationOrder> { /** * å页æ¥è¯¢ * @param page * @param query * @return */ IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -1,19 +1,116 @@ package org.jeecg.modules.eam.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.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderQuery; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService; import org.jeecg.modules.system.entity.BaseFactory; import org.jeecg.modules.system.entity.BaseFactoryUser; import org.jeecg.modules.system.service.IBaseFactoryService; import org.jeecg.modules.system.service.IBaseFactoryUserService; import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; /** * @Description: ææ¯ç¶æé´å®å·¥å * @Author: jeecg-boot * @Date: 2025-07-09 * @Date: 2025-07-09 * @Version: V1.0 */ @Service public class EamTechnicalStatusEvaluationOrderServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderMapper, EamTechnicalStatusEvaluationOrder> implements IEamTechnicalStatusEvaluationOrderService { @Autowired private IBaseFactoryUserService baseFactoryUserService; @Autowired private IBaseFactoryService baseFactoryService; @Autowired private IEamTechnicalStatusEvaluationOrderDetailService orderDetailService; @Autowired private IEamEquipmentService equipmentService; @Autowired private ISysBusinessCodeRuleService businessCodeRuleService; @Override public IPage<EamTechnicalStatusEvaluationOrder> queryPageList(Page<EamTechnicalStatusEvaluationOrder> page, EamTechnicalStatusEvaluationOrderQuery query) { QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ems.del_flag", CommonConstant.DEL_FLAG_0); //ç¨æ·æ°æ®æé LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { return page; } if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) { //éæ©äºè®¾å¤ï¼æ ¹æ®è®¾å¤idè¿æ»¤è®¾å¤ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(",")); queryWrapper.in("e.equipment_code", equipArr); } else { //没æéæ©è®¾å¤ï¼æ ¹æ®ä¸å¿è¿æ»¤è®¾å¤ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService. list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())); if (!CollectionUtils.isEmpty(baseFactoryUserList)) { Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet()); Set<String> factoryCodeList = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()); queryWrapper.in("e.factory_org_code", factoryCodeList); } else { return page; } } if (query != null) { //ç¼ç æ¨¡ç³æ¥è¯¢ if (StringUtils.isNotBlank(query.getOrderNum())) { queryWrapper.like("ems.order_num", query.getOrderNum()); } //è®¾å¤ if (StringUtils.isNotBlank(query.getEquipmentId())) { queryWrapper.eq("ems.equipment_id", query.getEquipmentId()); } //ä¿å »åç±» if (StringUtils.isNotBlank(query.getEvaluationStatus())) { queryWrapper.eq("ems.evaluation_status", query.getEvaluationStatus()); } if (query.getDateBegin() != null && query.getDateEnd() != null) { queryWrapper.between("ems.evaluation_date", query.getDateBegin(), query.getDateEnd()); } //æåº if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) { String column = query.getColumn(); if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) { column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX)); } if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) { queryWrapper.orderByAsc("ems." + oConvertUtils.camelToUnderline(column)); } else { queryWrapper.orderByDesc("ems." + oConvertUtils.camelToUnderline(column)); } } else { queryWrapper.orderByDesc("ems.create_time"); } } else { queryWrapper.orderByDesc("ems.create_time"); } queryWrapper.orderByDesc("ems.create_time"); return this.getBaseMapper().queryPageList(page, queryWrapper); } }