From 00b06418bf3353a454ec3eb0696cab2eeb777052 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 11 Nov 2024 14:00:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=9A=E7=94=A8select=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/constant/GlobalConstants.java | 550 ++++++++++++++++++ .../common/controller/SelectController.java | 125 ++++ .../material/common/domain/dto/SelectDto.java | 32 + .../common/domain/vo/AgreementVo.java | 20 + .../material/common/domain/vo/SelectVo.java | 16 + .../material/common/mapper/SelectMapper.java | 192 ++++++ .../common/service/SelectService.java | 178 ++++++ .../service/impl/SelectServiceImpl.java | 274 +++++++++ .../mapper/material/common/SelectMapper.xml | 217 +++++++ 9 files changed, 1604 insertions(+) create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/dto/SelectDto.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/SelectVo.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java create mode 100644 bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java new file mode 100644 index 00000000..f9263509 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java @@ -0,0 +1,550 @@ +package com.bonus.common.biz.constant; + +/** + * 全局常量 + * @author bns_han + */ +public class GlobalConstants { + /** + * 字符 A + */ + public static final char CHAR_A = 'A'; + /** + * 字符 B + */ + public static final char CHAR_B = 'B'; + /** + * 字符 C + */ + public static final char CHAR_C = 'C'; + /** + * 字符 D + */ + public static final char CHAR_D = 'D'; + /** + * 字符 E + */ + public static final char CHAR_E = 'E'; + /** + * 字符 F + */ + public static final char CHAR_F = 'F'; + /** + * 字符 G + */ + public static final char CHAR_G = 'G'; + /** + * 字符 H + */ + public static final char CHAR_H = 'H'; + /** + * 字符 I + */ + public static final char CHAR_I = 'I'; + /** + * 字符 J + */ + public static final char CHAR_J = 'J'; + /** + * 字符 K + */ + public static final char CHAR_K = 'K'; + /** + * 字符 L + */ + public static final char CHAR_L = 'L'; + /** + * 字符 M + */ + public static final char CHAR_M = 'M'; + /** + * 字符 N + */ + public static final char CHAR_N = 'N'; + /** + * 字符 O + */ + public static final char CHAR_O = 'O'; + /** + * 字符 P + */ + public static final char CHAR_P = 'P'; + /** + * 字符 Q + */ + public static final char CHAR_Q = 'Q'; + /** + * 字符 R + */ + public static final char CHAR_R = 'R'; + /** + * 字符 S + */ + public static final char CHAR_S = 'S'; + /** + * 字符 T + */ + public static final char CHAR_T = 'T'; + /** + * 字符 U + */ + public static final char CHAR_U = 'U'; + /** + * 字符 V + */ + public static final char CHAR_V = 'V'; + /** + * 字符 W + */ + public static final char CHAR_W = 'W'; + /** + * 字符 X + */ + public static final char CHAR_X = 'X'; + /** + * 字符 Y + */ + public static final char CHAR_Y = 'Y'; + /** + * 字符 Z + */ + public static final char CHAR_Z = 'Z'; + + + /** + * 字符 a + */ + public static final char CHAR_SMALL_A = 'a'; + /** + * 字符 b + */ + public static final char CHAR_SMALL_B = 'b'; + /** + * 字符 c + */ + public static final char CHAR_SMALL_C = 'c'; + /** + * 字符 d + */ + public static final char CHAR_SMALL_D = 'd'; + /** + * 字符 e + */ + public static final char CHAR_SMALL_E = 'e'; + /** + * 字符 f + */ + public static final char CHAR_SMALL_F = 'f'; + /** + * 字符 g + */ + public static final char CHAR_SMALL_G = 'g'; + /** + * 字符 h + */ + public static final char CHAR_SMALL_H = 'h'; + /** + * 字符 i + */ + public static final char CHAR_SMALL_I = 'i'; + /** + * 字符 j + */ + public static final char CHAR_SMALL_J = 'j'; + /** + * 字符 k + */ + public static final char CHAR_SMALL_K = 'k'; + /** + * 字符 l + */ + public static final char CHAR_SMALL_L = 'l'; + /** + * 字符 m + */ + public static final char CHAR_SMALL_M = 'm'; + /** + * 字符 n + */ + public static final char CHAR_SMALL_N = 'n'; + /** + * 字符 o + */ + public static final char CHAR_SMALL_O = 'o'; + /** + * 字符 p + */ + public static final char CHAR_SMALL_P = 'p'; + /** + * 字符 q + */ + public static final char CHAR_SMALL_Q = 'q'; + /** + * 字符 r + */ + public static final char CHAR_SMALL_R = 'r'; + /** + * 字符 s + */ + public static final char CHAR_SMALL_S = 's'; + /** + * 字符 t + */ + public static final char CHAR_SMALL_T = 't'; + /** + * 字符 u + */ + public static final char CHAR_SMALL_U = 'u'; + /** + * 字符 v + */ + public static final char CHAR_SMALL_V = 'v'; + /** + * 字符 w + */ + public static final char CHAR_SMALL_W = 'w'; + /** + * 字符 x + */ + public static final char CHAR_SMALL_X = 'x'; + /** + * 字符 y + */ + public static final char CHAR_SMALL_Y = 'y'; + /** + * 字符 z + */ + public static final char CHAR_SMALL_Z = 'z'; + + /** + * 字符 0 + */ + public static final char CHAR_0 = '0'; + /** + * 字符 9 + */ + public static final char CHAR_9 = '9'; + + + /** + * 整数 2 + */ + public static final int INT_2 = 2; + /** + * 整数 3 + */ + public static final int INT_3 = 3; + /** + * 整数 4 + */ + public static final int INT_4 = 4; + /** + * 整数 5 + */ + public static final int INT_5 = 5; + /** + * 整数 6 + */ + public static final int INT_6 = 6; + /** + * 整数 7 + */ + public static final int INT_7 = 7; + /** + * 整数 8 + */ + public static final int INT_8 = 8; + /** + * 整数 9 + */ + public static final int INT_9 = 9; + /** + * 整数 10 + */ + public static final int INT_10 = 10; + /** + * 整数 11 + */ + public static final int INT_11 = 11; + /** + * 整数 12 + */ + public static final int INT_12 = 12; + /** + * 整数 13 + */ + public static final int INT_13 = 13; + /** + * 整数 15 + */ + public static final int INT_15 = 15; + /** + * 整数 16 + */ + public static final int INT_16 = 16; + /** + * 整数 25 + */ + public static final int INT_25 = 25; + /** + * 整数 26 + */ + public static final int INT_26 = 26; + /** + * 整数 41 + */ + public static final int INT_41 = 41; + /** + * 整数 51 + */ + public static final int INT_51 = 51; + /** + * 整数 52 + */ + public static final int INT_52 = 52; + /** + * 整数 55 + */ + public static final int INT_55 = 55; + /** + * 整数 56 + */ + public static final int INT_56 = 56; + /** + * 整数 57 + */ + public static final int INT_57 = 57; + /** + * 整数 61 + */ + public static final int INT_61 = 61; + /** + * 整数 62 + */ + public static final int INT_62 = 62; + /** + * 整数 63 + */ + public static final int INT_63 = 63; + /** + * 整数 64 + */ + public static final int INT_64 = 64; + /** + * 整数 66 + */ + public static final int INT_66 = 66; + /** + * 整数 70 + */ + public static final int INT_70 = 70; + /** + * 整数 71 + */ + public static final int INT_71 = 71; + /** + * 整数 72 + */ + public static final int INT_72 = 72; + /** + * 整数 73 + */ + public static final int INT_73 = 73; + /** + * 整数 74 + */ + public static final int INT_74 = 74; + /** + * 整数 77 + */ + public static final int INT_77 = 77; + /** + * 整数 78 + */ + public static final int INT_78 = 78; + /** + * 整数 80 + */ + public static final int INT_80 = 80; + /** + * 整数 81 + */ + public static final int INT_81 = 81; + /** + * 整数 82 + */ + public static final int INT_82 = 82; + /** + * 整数 91 + */ + public static final int INT_91 = 91; + /** + * 整数 97 + */ + public static final int INT_97 = 97; + /** + * 整数 98 + */ + public static final int INT_98 = 98; + /** + * 整数 99 + */ + public static final int INT_99 = 99; + /** + * 整数 100 + */ + public static final int INT_100 = 100; + /** + * 整数 1000 + */ + public static final int INT_1000 = 1000; + /** + * 整数 255 + */ + public static final int INT_255 = 255; + /** + * 整数 0x3 + */ + public static final int INT_0X3 = 0x3; + /** + * 整数 0xf + */ + public static final int INT_0XF = 0xf; + + + /** + * 字符串 1 + */ + public static final String STRING_1 = "1"; + /** + * 字符串 2 + */ + public static final String STRING_2 = "2"; + /** + * 字符串 3 + */ + public static final String STRING_3 = "3"; + /** + * 字符串 4 + */ + public static final String STRING_4 = "4"; + /** + * 字符串 5 + */ + public static final String STRING_5 = "5"; + /** + * 字符串 [] + */ + public static final String STRING = "[]"; + /** + * 字符串 JPG + */ + public static final String STRING_JPG = "JPG"; + /** + * 字符串 PNG + */ + public static final String STRING_PNG = "PNG"; + /** + * 字符串 注： + */ + public static final String STRING_注 = "注："; + /** + * 字符串 . + */ + public static final String STRING_DROP = "."; + /** + * 字符串 .. + */ + public static final String STRING_DROP_DROP = ".."; + /** + * 字符串 MSIE + */ + public static final String STRING_MSIE = "MSIE"; + /** + * 字符串 Firefox + */ + public static final String STRING_FIREFOX = "Firefox"; + /** + * 字符串 Chrome + */ + public static final String STRING_CHROME = "Chrome"; + /** + * 字符串 #// + */ + public static final String STRING_HASH_HASH = "#//"; + /** + * 字符串 unknown + */ + public static final String STRING_UNKNOWN = "unknown"; + /** + * 字符串 , + */ + public static final String STRING_COMMA = ","; + /** + * 字符串 * + */ + public static final String STRING_ASTERISK = "*"; + /** + * 字符串 ascending + */ + public static final String STRING_ASCENDING = "ascending"; + /** + * 字符串 descending + */ + public static final String STRING_DESCENDING = "descending"; + /** + * 字符串 application/json + */ + public static final String STRING_APPLICATION_JSON = "application/json"; + /** + * 字符串 XMLHttpRequest + */ + public static final String STRING_XML_HTTP_REQUEST = "XMLHttpRequest"; + /** + * 字符串 .json + */ + public static final String STRING_JSON = ".json"; + /** + * 字符串 .xml + */ + public static final String STRING_XML = ".xml"; + /** + * 字符串 _ + */ + public static final String STRING_UNDERLINE = "_"; + /** + * 字符串 win + */ + public static final String STRING_WIN = "win"; + /** + * 字符串 ok + */ + public static final String STRING_OK = "ok"; + /** + * 字符串 true + */ + public static final String STRING_TRUE = "true"; + /** + * 字符串 sys.account.registerUser + */ + public static final String STRING_SYS_ACCOUNT_REGISTER_USER = "sys.account.registerUser"; + + + + /** + * Long 4294967295L + */ + public static final Long LONG_4294967295 = 4294967295L; + /** + * Long 255L + */ + public static final Long LONG_255 = 255L; + /** + * Long 16777215L + */ + public static final Long LONG_16777215 = 16777215L; + /** + * Long 65535L + */ + public static final Long LONG_65535 = 65535L; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java new file mode 100644 index 00000000..862fd6c6 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java @@ -0,0 +1,125 @@ +package com.bonus.material.common.controller; + +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.common.domain.dto.SelectDto; +import com.bonus.material.common.service.SelectService; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; + +/** + * @author 10488 + * 统一下拉选 + */ +@RestController +@RequestMapping("/select/") +public class SelectController { + + @Resource(name = "SelectService") + private SelectService service; + + @ApiOperation(value = "往来单位下拉选") + @PostMapping("getUnitCbx") + public AjaxResult getUnitData(@RequestBody SelectDto dto) { + return service.getUnitData(dto); + } + + @ApiOperation(value = "工程下拉选") + @PostMapping("getSectionEngineeringCbx") + public AjaxResult getProData(@RequestBody SelectDto dto) { + return service.getProData(dto); + } + + @ApiOperation(value = "机具类型下拉选") + @PostMapping("getMaTypeData") + public AjaxResult getMaTypeData(@RequestBody SelectDto dto){ + return service.getMaTypeData(dto); + } + + @ApiOperation(value = "数据字典下拉选") + @PostMapping("getDictByPidCbx") + public AjaxResult getDictByPidCbx(@RequestBody SelectDto dto){ + return service.getDictByPidCbx(dto); + } + + @ApiOperation(value = "单位树/归属部门/所属上级") + @PostMapping("getDeptTree") + public AjaxResult getDeptTree(@RequestBody SelectDto dto){ + return service.getDeptTree(dto); + } + + @ApiOperation(value = "岗位下拉选") + @PostMapping("getPostCbx") + public AjaxResult getPostCbx(@RequestBody SelectDto dto){ + return service.getPostCbx(dto); + } + + @ApiOperation(value = "角色下拉选") + @PostMapping("getRoleCbx") + public AjaxResult getRoleCbx(@RequestBody SelectDto dto){ + return service.getRoleCbx(dto); + } + + @ApiOperation(value = "单位类型下拉选") + @PostMapping("getUnitTypeCbx") + public AjaxResult getUnitTypeCbx(@RequestBody SelectDto dto){ + return service.getUnitTypeCbx(dto); + } + + @ApiOperation(value = "设备类型树") + @PostMapping("getDeviceTypeTree") + public AjaxResult getDeviceTypeTree(@RequestBody SelectDto dto){ + return service.getDeviceTypeTree(dto); + } + + @ApiOperation(value = "资产属性") + @PostMapping("getAssetAttributesCbx") + public AjaxResult getAssetAttributesCbx(@RequestBody SelectDto dto){ + return service.getAssetAttributesCbx(dto); + } + + @ApiOperation(value = "机具厂家") + @PostMapping("getDeviceFactoryCbx") + public AjaxResult getDeviceFactoryCbx(@RequestBody SelectDto dto){ + return service.getDeviceFactoryCbx(dto); + } + + @ApiOperation(value = "工程项目") + @PostMapping("getProCbx") + public AjaxResult getProCbx(@RequestBody SelectDto dto){ + return service.getProCbx(dto); + } + + @ApiOperation(value = "配件所属上级树") + @PostMapping("getAccessoryTree") + public AjaxResult getAccessoryTree(){ + return service.getAccessoryTree(); + } + + @ApiOperation(value = "配件所属上级树") + @PostMapping("getPartTree") + public AjaxResult getPartTree(@RequestBody SelectDto dto){ + return service.getPartTree(dto); + } + + @ApiOperation(value = "货架") + @PostMapping("getGoodsShelvesCbx") + public AjaxResult getGoodsShelvesCbx(@RequestBody SelectDto dto){ + return service.getGoodsShelvesCbx(dto); + } + + @ApiOperation(value = "用户/维修员/库管员/采购员") + @PostMapping("getUserByRoleIdCbx") + public AjaxResult getUserByRoleIdCbx(@RequestBody SelectDto dto){ + return service.getUserByRoleIdCbx(dto); + } + + @ApiOperation(value = "往来单位id和标段工程id获取协议信息") + @PostMapping("getAgreementInfoById") + public AjaxResult getAgreementInfoById(@RequestBody SelectDto dto){ + return service.getAgreementInfoById(dto); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/dto/SelectDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/dto/SelectDto.java new file mode 100644 index 00000000..da31321c --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/dto/SelectDto.java @@ -0,0 +1,32 @@ +package com.bonus.material.common.domain.dto; + +import lombok.Data; + +/** + * @author 10488 + */ +@Data +public class SelectDto { + + /** 参数id*/ + private String id; + + /** 2.物品种类 3.设备类型 4.规格型号*/ + private String type; + + /** 字典表 父类值*/ + private String parentValue; + + /** 层级*/ + private String level; + + /** 角色权限字符串*/ + private String roleKey; + + /** 往来单位id*/ + private int unitId; + + /** 标段工程id*/ + private int projectId; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java new file mode 100644 index 00000000..b869cbcc --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/AgreementVo.java @@ -0,0 +1,20 @@ +package com.bonus.material.common.domain.vo; + +import lombok.Data; + +/** + * @author 10488 + * 协议信息 + */ +@Data +public class AgreementVo { + + /** 协议ID*/ + private Integer agreementId; + + /** 协议编号*/ + private String agreementCode; + + /** 是否结算*/ + private String isSlt; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/SelectVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/SelectVo.java new file mode 100644 index 00000000..1ecb6d57 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/domain/vo/SelectVo.java @@ -0,0 +1,16 @@ +package com.bonus.material.common.domain.vo; + +import lombok.Data; + +/** + * @author 10488 + */ +@Data +public class SelectVo { + + /** id*/ + private long id; + + /** 名称*/ + private String name; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java new file mode 100644 index 00000000..887bddd7 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/mapper/SelectMapper.java @@ -0,0 +1,192 @@ +package com.bonus.material.common.mapper; + +import com.bonus.common.biz.domain.TreeNode; +import com.bonus.material.common.domain.dto.SelectDto; +import com.bonus.material.common.domain.vo.AgreementVo; +import com.bonus.material.common.domain.vo.SelectVo; +import org.springframework.stereotype.Repository; +import java.util.List; + +/** + * @author 10488 + * 统一下拉选 + */ +@Repository("SelectMapper") +public interface SelectMapper { + /** + * 往来单位下拉选 + * @param dto + * @return List + * @description 往来单位 + * @author cwchen + * @date 2023/12/20 14:23 + */ + List getUnitData(SelectDto dto); + + /** + * 工程下拉选 + * @param dto + * @return List + * @description 工程 + * @author cwchen + * @date 2023/12/20 15:05 + */ + List getProData(SelectDto dto); + + /** + * 机具类型下拉选 + * @param dto + * @return List + * @description 机具类型 + * @author cwchen + * @date 2023/12/20 16:02 + */ + List getMaTypeData(SelectDto dto); + + /** + * 数据字典下拉选 + * @param dto + * @return List + * @description 数据字典下拉选 + * @author cwchen + * @date 2023/12/20 16:23 + */ + List getDictByPidCbx(SelectDto dto); + + /** + * 单位树/归属部门/所属上级 + * @param dto + * @return List + * @description 单位树/归属部门/所属上级 + * @author cwchen + * @date 2023/12/20 17:10 + */ + List getDeptTree(SelectDto dto); + + /** + * 岗位下拉选 + * @param dto + * @return List + * @description 岗位下拉选 + * @author cwchen + * @date 2023/12/20 17:50 + */ + List getPostCbx(SelectDto dto); + + /** + * 角色下拉选 + * @param dto + * @return List + * @description 角色下拉选 + * @author cwchen + * @date 2023/12/20 17:56 + */ + List getRoleCbx(SelectDto dto); + + /** + * 单位类型下拉选 + * @param dto + * @return List + * @description 单位类型下拉选 + * @author cwchen + * @date 2023/12/20 18:01 + */ + List getUnitTypeCbx(SelectDto dto); + + /** + * 设备类型树 + * @param dto + * @return List + * @description 设备类型树 + * @author cwchen + * @date 2023/12/20 18:15 + */ + List getDeviceTypeTree(SelectDto dto); + + /** + * 资产属性 + * @param dto + * @return List + * @description 资产属性 + * @author cwchen + * @date 2023/12/20 19:48 + */ + List getAssetAttributesCbx(SelectDto dto); + + /** + * 机具厂家 + * @param dto + * @return List + * @description 机具厂家 + * @author cwchen + * @date 2023/12/20 19:57 + */ + List getDeviceFactoryCbx(SelectDto dto); + + /** + * 工程项目 + * @param dto + * @return List + * @description 工程项目 + * @author cwchen + * @date 2023/12/20 20:01 + */ + List getProCbx(SelectDto dto); + + /** + * 配件所属上级树 + * @param + * @return List + * @description 配件所属上级树 + * @author cwchen + * @date 2023/12/20 20:26 + */ + List getAccessoryTree(); + + /** + * 货架 + * @param dto + * @return List + * @description 货架 + * @author cwchen + * @date 2023/12/20 20:36 + */ + List getGoodsShelvesCbx(SelectDto dto); + + /** + * 用户/维修员/库管员/采购员-下拉选 + * @param dto + * @return List + * @description 用户/维修员/库管员/采购员-下拉选 + * @author cwchen + * @date 2023/12/20 20:54 + */ + List getUserByRoleIdCbxSelect(SelectDto dto); + + /** + * 用户/维修员/库管员/采购员-树 + * @param dto + * @return List + * @description 用户/维修员/库管员/采购员-树 + * @author cwchen + * @date 2023/12/20 21:02 + */ + List getUserByRoleIdCbxTree(SelectDto dto); + + /** + * 往来单位id和标段工程id获取协议信息 + * @param dto + * @return AgreementVo + * @description 往来单位id和标段工程id获取协议信息 + * @author cwchen + * @date 2023/12/21 10:53 + */ + List getAgreementInfoById(SelectDto dto); + + /** + * 配件所属上级树 + * @param dto + * @return List + */ + List getPartTree(SelectDto dto); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java new file mode 100644 index 00000000..f5d32053 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/SelectService.java @@ -0,0 +1,178 @@ +package com.bonus.material.common.service; + +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.common.domain.dto.SelectDto; + +/** + * @author 10488 + * 统一下拉选 + */ +public interface SelectService { + + /** + * 往来单位 + * @param dto + * @return AjaxResult + * @description 往来单位 + * @author cwchen + * @date 2023/12/20 14:20 + */ + AjaxResult getUnitData(SelectDto dto); + + /** + * 工程 + * @param dto + * @return AjaxResult + * @description 工程 + * @author cwchen + * @date 2023/12/20 15:04 + */ + AjaxResult getProData(SelectDto dto); + + /** + * 机具类型 + * @param dto + * @return AjaxResult + * @description 机具类型 + * @author cwchen + * @date 2023/12/20 16:02 + */ + AjaxResult getMaTypeData(SelectDto dto); + + /** + * 数据字典下拉选 + * @param dto + * @return AjaxResult + * @description 数据字典下拉选 + * @author cwchen + * @date 2023/12/20 16:22 + */ + AjaxResult getDictByPidCbx(SelectDto dto); + + /** + * 单位树/归属部门/所属上级 + * @param dto + * @return AjaxResult + * @description 单位树/归属部门/所属上级 + * @author cwchen + * @date 2023/12/20 16:36 + */ + AjaxResult getDeptTree(SelectDto dto); + + /** + * 岗位下拉树 + * @param dto + * @return AjaxResult + * @description 岗位下拉树 + * @author cwchen + * @date 2023/12/20 17:45 + */ + AjaxResult getPostCbx(SelectDto dto); + + /** + * 角色下拉选 + * @param dto + * @return AjaxResult + * @description 角色下拉选 + * @author cwchen + * @date 2023/12/20 17:56 + */ + AjaxResult getRoleCbx(SelectDto dto); + + /** + * 单位类型下拉选 + * @param dto + * @return AjaxResult + * @description 单位类型下拉选 + * @author cwchen + * @date 2023/12/20 18:00 + */ + AjaxResult getUnitTypeCbx(SelectDto dto); + + /** + * 设备类型树 + * @param dto + * @return AjaxResult + * @description 设备类型树 + * @author cwchen + * @date 2023/12/20 18:14 + */ + AjaxResult getDeviceTypeTree(SelectDto dto); + + /** + * 资产属性 + * @param dto + * @return AjaxResult + * @description 资产属性 + * @author cwchen + * @date 2023/12/20 19:47 + */ + AjaxResult getAssetAttributesCbx(SelectDto dto); + + /** + * 机具厂家 + * @param dto + * @return AjaxResult + * @description 机具厂家 + * @author cwchen + * @date 2023/12/20 19:56 + */ + AjaxResult getDeviceFactoryCbx(SelectDto dto); + + /** + * 工程项目 + * @param dto + * @return AjaxResult + * @description 工程项目 + * @author cwchen + * @date 2023/12/20 20:01 + */ + AjaxResult getProCbx(SelectDto dto); + + /** + * 配件所属上级树 + * @param + * @return AjaxResult + * @description 配件所属上级树 + * @author cwchen + * @date 2023/12/20 20:25 + */ + AjaxResult getAccessoryTree(); + + /** + * 货架 + * @param dto + * @return AjaxResult + * @description 货架 + * @author cwchen + * @date 2023/12/20 20:36 + */ + AjaxResult getGoodsShelvesCbx(SelectDto dto); + + /** + * 用户/维修员/库管员/采购员 + * @param dto + * @return AjaxResult + * @description 用户/维修员/库管员/采购员 + * @author cwchen + * @date 2023/12/20 20:48 + */ + AjaxResult getUserByRoleIdCbx(SelectDto dto); + + /** + * 往来单位id和标段工程id获取协议信息 + * @param dto + * @return AjaxResult + * @description 往来单位id和标段工程id获取协议信息 + * @author cwchen + * @date 2023/12/21 10:47 + */ + AjaxResult getAgreementInfoById(SelectDto dto); + + /** + * 配件所属上级树 + * @param dto + * @return AjaxResult + */ + AjaxResult getPartTree(SelectDto dto); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java new file mode 100644 index 00000000..80bf8c57 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/service/impl/SelectServiceImpl.java @@ -0,0 +1,274 @@ +package com.bonus.material.common.service.impl; + +import com.bonus.common.biz.constant.GlobalConstants; +import com.bonus.common.biz.domain.TreeBuild; +import com.bonus.common.biz.domain.TreeNode; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.material.common.domain.dto.SelectDto; +import com.bonus.material.common.domain.vo.AgreementVo; +import com.bonus.material.common.domain.vo.SelectVo; +import com.bonus.material.common.mapper.SelectMapper; +import com.bonus.material.common.service.SelectService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * @author 10488 + * 统一下拉选 + */ +@Service("SelectService") +@Slf4j +public class SelectServiceImpl implements SelectService { + + @Resource(name = "SelectMapper") + private SelectMapper mapper; + + @Override + public AjaxResult getUnitData(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getUnitData(dto); + } catch (Exception e) { + log.error("往来单位-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getProData(SelectDto dto) { + try { + List list = mapper.getProData(dto); + list.removeIf(item -> item == null); + return AjaxResult.success(list); + } catch (Exception e) { + log.error("工程-查询失败", e); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult getMaTypeData(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getMaTypeData(dto); + } catch (Exception e) { + log.error("机具类型-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getDictByPidCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getDictByPidCbx(dto); + } catch (Exception e) { + log.error("数据字典-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getDeptTree(SelectDto dto) { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + list = mapper.getDeptTree(dto); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + TreeBuild treeBuild = new TreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + } catch (Exception e) { + log.error("单位树/归属部门/所属上级-查询失败", e); + } + return AjaxResult.success(groupList); + } + + @Override + public AjaxResult getPostCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getPostCbx(dto); + } catch (Exception e) { + log.error("岗位下拉选-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getRoleCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getRoleCbx(dto); + } catch (Exception e) { + log.error("角色下拉选-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getUnitTypeCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getUnitTypeCbx(dto); + } catch (Exception e) { + log.error("单位类型下拉选-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getDeviceTypeTree(SelectDto dto) { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + list = mapper.getDeviceTypeTree(dto); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + TreeBuild treeBuild = new TreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + } catch (Exception e) { + log.error("单位树/归属部门/所属上级-查询失败", e); + } + return AjaxResult.success(groupList); + } + + @Override + public AjaxResult getAssetAttributesCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getAssetAttributesCbx(dto); + } catch (Exception e) { + log.error("资产属性-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getDeviceFactoryCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getDeviceFactoryCbx(dto); + } catch (Exception e) { + log.error("机具厂家-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getProCbx(SelectDto dto) { + List list = new ArrayList<>(); + try { + list = mapper.getProCbx(dto); + } catch (Exception e) { + log.error("工程项目-查询失败", e); + } + return AjaxResult.success(list); + } + + @Override + public AjaxResult getAccessoryTree() { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + list = mapper.getAccessoryTree(); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + TreeBuild treeBuild = new TreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + } catch (Exception e) { + log.error("配件所属上级树-查询失败", e); + } + return AjaxResult.success(groupList); + } + + @Override + public AjaxResult getPartTree(SelectDto dto) { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + list = mapper.getPartTree(dto); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + TreeBuild treeBuild = new TreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + } catch (Exception e) { + log.error("配件所属上级树-查询失败", e); + } + return AjaxResult.success(groupList); + } + + @Override + public AjaxResult getGoodsShelvesCbx(SelectDto dto) { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + try { + list = mapper.getGoodsShelvesCbx(dto); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + TreeBuild treeBuild = new TreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + } catch (Exception e) { + log.error("货架-查询失败", e); + } + return AjaxResult.success(groupList); + } + + @Override + public AjaxResult getUserByRoleIdCbx(SelectDto dto) { + try { + if (Objects.equals(GlobalConstants.STRING_1, dto.getType())) { + // 用户/维修员/库管员/采购员-下拉选 + List list = new ArrayList<>(); + list = mapper.getUserByRoleIdCbxSelect(dto); + return AjaxResult.success(list); + } else if (Objects.equals(GlobalConstants.STRING_2, dto.getType())) { + List groupList = new ArrayList<>(); + List list = new ArrayList<>(); + // 用户/维修员/库管员/采购员-树 + list = mapper.getUserByRoleIdCbxTree(dto); + if (CollectionUtils.isNotEmpty(list)) { + // 创建树形结构（数据集合作为参数） + TreeBuild treeBuild = new TreeBuild(list); + // 原查询结果转换树形结构 + groupList = treeBuild.buildTree(); + } + return AjaxResult.success(groupList); + } + } catch (Exception e) { + log.error("用户/维修员/库管员/采购员-查询失败", e); + } + return AjaxResult.success(null); + } + + @Override + public AjaxResult getAgreementInfoById(SelectDto dto) { + AgreementVo vo = new AgreementVo(); + try { + List list = mapper.getAgreementInfoById(dto); + if (CollectionUtils.isNotEmpty(list)) { + vo = list.get(0); + } + } catch (Exception e) { + log.error("往来单位id和标段工程id获取协议信息", e); + } + return AjaxResult.success(vo); + } + + +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml new file mode 100644 index 00000000..78c6a8fe --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 219fa82d64dc62e16d7af5f8817f1f39d2fff3bf Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 11 Nov 2024 14:51:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=9A=E7=94=A8select=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/common/controller/SelectController.java | 2 ++ .../main/resources/mapper/material/common/SelectMapper.xml | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java index 862fd6c6..8d407a5f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/controller/SelectController.java @@ -3,6 +3,7 @@ package com.bonus.material.common.controller; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.common.domain.dto.SelectDto; import com.bonus.material.common.service.SelectService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -14,6 +15,7 @@ import javax.annotation.Resource; * @author 10488 * 统一下拉选 */ +@Api(tags = "统一下拉选接口") @RestController @RequestMapping("/select/") public class SelectController { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml index 78c6a8fe..a5b2f99f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml @@ -94,13 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name AS label, mt.parent_id AS parentId, mt.unit_name AS unitName, - mt.company_id AS companyId, - mt.code, CASE mt.manage_type WHEN 0 THEN IFNULL(subquery0.num, 0) ELSE - IFNULL(mt.num, 0) + IFNULL(mt.storage_num, 0) END as num, mt.model_code AS modelCode, mt.manage_type AS manageType @@ -114,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id WHERE mm.ma_code is not null and mm.ma_status in (15) GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id - WHERE mt.del_flag = '0' and mt.is_whole_set IS NULL + WHERE mt.del_flag = '0' AND mt.level IN ('1','2') From 0992fa22d7c6d8ec2acf6a63bde92e507a7edd22 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 11 Nov 2024 15:22:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/biz/constant/GlobalConstants.java | 5 +++ .../controller/BmAgreementInfoController.java | 6 ++- .../basic/mapper/BmAgreementInfoMapper.java | 3 ++ .../service/IBmAgreementInfoService.java | 4 +- .../impl/BmAgreementInfoServiceImpl.java | 42 +++++++++++++++++-- .../material/basic/BmAgreementInfoMapper.xml | 4 ++ 6 files changed, 59 insertions(+), 5 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java index f9263509..810b4402 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java @@ -547,4 +547,9 @@ public class GlobalConstants { * Long 65535L */ public static final Long LONG_65535 = 65535L; + + public static final int NUM_9 = 9; + public static final int NUM_100 = 100; + public static final int NUM_99 = 99; + public static final int NUM_1000 = 1000; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAgreementInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAgreementInfoController.java index 63e0e3cf..377930fc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAgreementInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAgreementInfoController.java @@ -87,7 +87,11 @@ public class BmAgreementInfoController extends BaseController @PostMapping public AjaxResult add(@RequestBody BmAgreementInfo bmAgreementInfo) { - return toAjax(bmAgreementInfoService.insertBmAgreementInfo(bmAgreementInfo)); + try { + return bmAgreementInfoService.insertBmAgreementInfo(bmAgreementInfo); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java index 04a47f72..1e8919d2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmAgreementInfoMapper.java @@ -1,5 +1,6 @@ package com.bonus.material.basic.mapper; +import java.util.Date; import java.util.List; import com.bonus.material.basic.domain.BmAgreementInfo; @@ -58,4 +59,6 @@ public interface BmAgreementInfoMapper * @return 结果 */ public int deleteBmAgreementInfoByAgreementIds(Long[] agreementIds); + + public int selectNumByMonth(Date nowDate); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmAgreementInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmAgreementInfoService.java index 41579fb1..9c19749b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmAgreementInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmAgreementInfoService.java @@ -1,6 +1,8 @@ package com.bonus.material.basic.service; import java.util.List; + +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.basic.domain.BmAgreementInfo; /** @@ -33,7 +35,7 @@ public interface IBmAgreementInfoService * @param bmAgreementInfo 协议管理 * @return 结果 */ - public int insertBmAgreementInfo(BmAgreementInfo bmAgreementInfo); + public AjaxResult insertBmAgreementInfo(BmAgreementInfo bmAgreementInfo); /** * 修改协议管理 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java index ae9b2e95..45e61c7a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java @@ -1,12 +1,20 @@ package com.bonus.material.basic.service.impl; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; + +import com.bonus.common.biz.constant.GlobalConstants; +import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.basic.mapper.BmAgreementInfoMapper; import com.bonus.material.basic.domain.BmAgreementInfo; import com.bonus.material.basic.service.IBmAgreementInfoService; +import org.springframework.util.CollectionUtils; /** * 协议管理Service业务层处理 @@ -51,10 +59,38 @@ public class BmAgreementInfoServiceImpl implements IBmAgreementInfoService * @return 结果 */ @Override - public int insertBmAgreementInfo(BmAgreementInfo bmAgreementInfo) + public AjaxResult insertBmAgreementInfo(BmAgreementInfo bmAgreementInfo) { - bmAgreementInfo.setCreateTime(DateUtils.getNowDate()); - return bmAgreementInfoMapper.insertBmAgreementInfo(bmAgreementInfo); + List list = bmAgreementInfoMapper.selectBmAgreementInfoList(bmAgreementInfo); + if (!CollectionUtils.isEmpty(list) && list.size() > 0) { + return AjaxResult.error("已存在重复数据"); + } + try { + bmAgreementInfo.setCreateTime(DateUtils.getNowDate()); + bmAgreementInfo.setCreateBy(SecurityUtils.getUsername()); + bmAgreementInfo.setAgreementCode(getAgreementCode()); + return AjaxResult.success(bmAgreementInfoMapper.insertBmAgreementInfo(bmAgreementInfo)); + } catch (Exception e) { + throw new ServiceException("错误信息描述"); + } + } + + private String getAgreementCode() { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date nowDate = DateUtils.getNowDate(); + String format = dateFormat.format(nowDate); + String result = format.replace("-", ""); + int num = bmAgreementInfoMapper.selectNumByMonth(nowDate); + num = num + 1; + String code = ""; + if (num > GlobalConstants.NUM_9 && num < GlobalConstants.NUM_100) { + code = "XY" + result + "-00" + num; + } else if (num > GlobalConstants.NUM_99 && num < GlobalConstants.NUM_1000) { + code = "XY" + result + "-0" + num; + } else { + code = "XY" + result + "-000" + num; + } + return code; } /** diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml index d05a1ae6..1141f8d9 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml @@ -142,4 +142,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{agreementId} + + \ No newline at end of file