diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java index 587f205f..7c6df2df 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java @@ -276,7 +276,7 @@ public class ReportDocumentAssistService { private Map buildCreatePayload(String billNo, String workflowId, JSONObject payload) { LinkedHashMap var2 = new LinkedHashMap(); - var2.put("requestName", "用印-" + billNo); + var2.put("requestName", "公司用印申请(新版)-" + billNo); var2.put("workflowId", workflowId); var2.put("mainData", this.buildSealMainData(payload)); return var2; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java index af069763..58876a62 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java @@ -106,8 +106,8 @@ public class DeviceConfigBusinessRuleController extends AbstractFileUploadContro @GetMapping("/page") @Operation(summary = "获得设备-业务配置分页") public CommonResult> getDeviceConfigBusinessRulePage(@Valid DeviceConfigBusinessRulePageReqVO pageReqVO) { - PageResult pageResult = deviceConfigBusinessRuleService.getDeviceConfigBusinessRulePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DeviceConfigBusinessRuleRespVO.class)); + PageResult pageResult = deviceConfigBusinessRuleService.getDeviceConfigBusinessRulePage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") @@ -116,9 +116,9 @@ public class DeviceConfigBusinessRuleController extends AbstractFileUploadContro @ApiAccessLog(operateType = EXPORT) public void exportDeviceConfigBusinessRuleExcel(@Valid DeviceConfigBusinessRulePageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = deviceConfigBusinessRuleService.getDeviceConfigBusinessRulePage(pageReqVO).getList(); + List list = deviceConfigBusinessRuleService.getDeviceConfigBusinessRulePage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "设备-业务配置.xls", "数据", DeviceConfigBusinessRuleRespVO.class, BeanUtils.toBean(list, DeviceConfigBusinessRuleRespVO.class)); + ExcelUtils.write(response, "设备-业务配置.xls", "数据", DeviceConfigBusinessRuleRespVO.class, list); } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceProductController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceProductController.java index 6d30bf6d..3823bf40 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceProductController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceProductController.java @@ -94,18 +94,21 @@ public class DeviceProductController extends AbstractFileUploadController implem } List productIdList = list.stream().filter(item -> item.getNodeType().equals(DataTypeConstant.DATA_TYPE_DATA)).map(DeviceProductDO::getId).toList(); - - List ruleList = deviceConfigBusinessRuleService.getByProductIdListAndBusinessDomain(productIdList, ""); + DeviceConfigBusinessRulePageReqVO reqVO = new DeviceConfigBusinessRulePageReqVO(); + reqVO.setProductIdList(productIdList); + reqVO.setPageNo(1); + reqVO.setPageSize(-1); + List ruleList = deviceConfigBusinessRuleService.getDeviceConfigBusinessRulePage(reqVO).getList(); for(DeviceProductDO product: list){ Long id = product.getId(); JSONObject jsonObject = jsonArray.getJSONObject(jsonArray.indexOf(product)); - for(DeviceConfigBusinessRuleDO rule: ruleList){ + for(DeviceConfigBusinessRuleRespVO rule: ruleList){ Long productId = rule.getProductId(); if(!Objects.equals(productId, id)) continue; String businessDomain = rule.getBusinessDomain(); - String key = businessDomain + "_on"; - jsonObject.put(key, "1"); + jsonObject.put(businessDomain + "_on", "1"); + jsonObject.put(businessDomain + "_count", rule.getItemCount()); } jsonArray.set(jsonArray.indexOf(product), jsonObject); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRulePageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRulePageReqVO.java index 02044f87..0bdbe37e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRulePageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRulePageReqVO.java @@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import com.zt.plat.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import java.util.List; import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -61,4 +62,9 @@ public class DeviceConfigBusinessRulePageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + + //========扩展字段===== + @Schema(description = "设备大类id列表") + List productIdList; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRuleRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRuleRespVO.java index 41598256..3d61daa1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRuleRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessRuleRespVO.java @@ -79,4 +79,9 @@ public class DeviceConfigBusinessRuleRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + //====================扩展字段============ + @Schema(description = "配置项数量") + @ExcelProperty("配置项数量") + private Long itemCount; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceConfigBusinessRuleMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceConfigBusinessRuleMapper.java index 3d484d14..b2c5c5e4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceConfigBusinessRuleMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceConfigBusinessRuleMapper.java @@ -3,7 +3,13 @@ package com.zt.plat.module.qms.resource.device.dal.mapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; +import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentMainRespVO; +import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentDataDO; +import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceConfigBusinessRulePageReqVO; +import com.zt.plat.module.qms.resource.device.controller.vo.DeviceConfigBusinessRuleRespVO; +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceConfigBusinessItemDO; import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceConfigBusinessRuleDO; import org.apache.ibatis.annotations.Mapper; @@ -15,9 +21,13 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface DeviceConfigBusinessRuleMapper extends BaseMapperX { - default PageResult selectPage(DeviceConfigBusinessRulePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(DeviceConfigBusinessRuleDO::getProductId, reqVO.getProductId()) + default PageResult selectPage(DeviceConfigBusinessRulePageReqVO reqVO) { + MPJLambdaWrapperX wrapper = new MPJLambdaWrapperX<>(); + wrapper.selectAll(DeviceConfigBusinessRuleDO.class); + wrapper.selectSub(DeviceConfigBusinessItemDO.class, s-> + s.selectCount(DeviceConfigBusinessItemDO::getRuleId).eq(DeviceConfigBusinessItemDO::getRuleId, DeviceConfigBusinessRuleDO::getId), DeviceConfigBusinessRuleRespVO::getItemCount); + wrapper.eqIfPresent(DeviceConfigBusinessRuleDO::getProductId, reqVO.getProductId()) + .inIfPresent(DeviceConfigBusinessRuleDO::getProductId, reqVO.getProductIdList()) .eqIfPresent(DeviceConfigBusinessRuleDO::getBusinessDomain, reqVO.getBusinessDomain()) .eqIfPresent(DeviceConfigBusinessRuleDO::getRequireFlag, reqVO.getRequireFlag()) .eqIfPresent(DeviceConfigBusinessRuleDO::getSubitemDomainType, reqVO.getSubitemDomainType()) @@ -32,8 +42,11 @@ public interface DeviceConfigBusinessRuleMapper extends BaseMapperX() + return selectJoinPage(reqVO, DeviceConfigBusinessRuleRespVO.class, wrapper); } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java index 978e725c..8b2d4964 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java @@ -66,6 +66,6 @@ public interface DeviceConfigBusinessRuleService { * @param pageReqVO 分页查询 * @return 设备-业务配置分页 */ - PageResult getDeviceConfigBusinessRulePage(DeviceConfigBusinessRulePageReqVO pageReqVO); + PageResult getDeviceConfigBusinessRulePage(DeviceConfigBusinessRulePageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java index bbaff6c8..280563bd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java @@ -149,7 +149,7 @@ public class DeviceConfigBusinessRuleServiceImpl implements DeviceConfigBusiness } @Override - public PageResult getDeviceConfigBusinessRulePage(DeviceConfigBusinessRulePageReqVO pageReqVO) { + public PageResult getDeviceConfigBusinessRulePage(DeviceConfigBusinessRulePageReqVO pageReqVO) { return deviceConfigBusinessRuleMapper.selectPage(pageReqVO); }