From 0816c9168b449925d8c7714e04cb1c0cec92a869 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Thu, 1 Apr 2021 09:42:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=91=E5=A4=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8c9bea6..e1b8720 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,14 @@ -spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +#易品测试liuwanr服务器 -职站项目 +#spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/huoran?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +#spring.datasource.username=super +#spring.datasource.password=huoran888 +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +#或然正式服务器 -科大项目 +spring.datasource.url=jdbc:mysql://rm-wz9y13wf7u8q8610fwo.mysql.rds.aliyuncs.com:3306/keda?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.username=super spring.datasource.password=huoran888 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.jackson.default-property-inclusion=non_null From 7d251fcfb3ca67da5f676fecb57333fb75905c15 Mon Sep 17 00:00:00 2001 From: "rong.liu" Date: Thu, 1 Apr 2021 15:34:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A7=92=E8=89=B2id?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectManagementController.java | 70 ++++++++++--------- .../mapper/ProjectManagementMapper.java | 39 ++++++----- 2 files changed, 57 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java index 9d5a97c..193999a 100644 --- a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java +++ b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java @@ -58,20 +58,20 @@ public class ProjectManagementController { @ApiOperation(value = "椤圭洰绠＄悊鍒楄〃", notes = "椤圭洰绠＄悊鍒楄〃") @GetMapping("/queryAllManagements") R queryAllManagements( - @ApiParam(name = "projectPermissions", value = "椤圭洰鏉冮檺(0銆佺粌涔 1銆佽冩牳 2銆佺珵璧)", required = false) @RequestParam(required = false) Integer projectPermissions, - @ApiParam(name = "founder", value = "椤圭洰鍒涘缓浜(0銆佺郴缁 1銆佽佸笀)", required = false) @RequestParam(required = false) String founder, - @ApiParam(name = "state", value = "椤圭洰鐘舵(0銆佽崏绋跨 1銆佸凡鍙戝竷)", required = false) @RequestParam(required = false) Integer state, - @ApiParam(name = "projectName", value = "椤圭洰鍚嶇О", required = false) @RequestParam(required = false) String projectName, - @ApiParam(name = "systemId", value = "绯荤粺id", required = true) @RequestParam Integer systemId, - @ApiParam(name = "userId", value = "鐢ㄦ埛id", required = true) @RequestParam Integer userId, - @ApiParam(name = "pageNo", value = "璧峰椤垫暟", required = true) @RequestParam Integer pageNo, - @ApiParam(name = "pageSize", value = "椤垫暟", required = true) @RequestParam Integer pageSize) { + @ApiParam(name = "projectPermissions", value = "椤圭洰鏉冮檺(0銆佺粌涔 1銆佽冩牳 2銆佺珵璧)", required = false) @RequestParam(required = false) Integer projectPermissions, + @ApiParam(name = "founder", value = "椤圭洰鍒涘缓浜(0銆佺郴缁 1銆佽佸笀)", required = false) @RequestParam(required = false) String founder, + @ApiParam(name = "state", value = "椤圭洰鐘舵(0銆佽崏绋跨 1銆佸凡鍙戝竷)", required = false) @RequestParam(required = false) Integer state, + @ApiParam(name = "projectName", value = "椤圭洰鍚嶇О", required = false) @RequestParam(required = false) String projectName, + @ApiParam(name = "systemId", value = "绯荤粺id", required = true) @RequestParam Integer systemId, + @ApiParam(name = "userId", value = "鐢ㄦ埛id", required = true) @RequestParam Integer userId, + @ApiParam(name = "pageNo", value = "璧峰椤垫暟", required = true) @RequestParam Integer pageNo, + @ApiParam(name = "pageSize", value = "椤垫暟", required = true) @RequestParam Integer pageSize) { R r = new R(); ProjectManagement vo = new ProjectManagement(); if (null != projectPermissions) { vo.setProjectPermissions(projectPermissions); } - if (null != founder && founder !="") { + if (null != founder && founder != "") { vo.setFounder(founder); } if (null != state) { @@ -86,19 +86,19 @@ public class ProjectManagementController { if (null != userId) { vo.setUserId(userId); } - if (null != pageNo){ + if (null != pageNo) { vo.setPageNo(pageNo); } - if (null != pageSize){ + if (null != pageSize) { vo.setPageSize(pageSize); } HashMap ret = service.queryAllManagements(vo); int status = (int) ret.get("retcode"); if (status == 200) { r.put("status", 200); - r.put("pageInfo",ret.get("pageInfo")); + r.put("pageInfo", ret.get("pageInfo")); } else { - R.error(500,ret.get("retvalue").toString()); + R.error(500, ret.get("retvalue").toString()); } return r; } @@ -155,6 +155,7 @@ public class ProjectManagementController { // } // return resp; // } + /** * 椤甸潰鏌ヨ,鎺掗櫎缁冧範 *

@@ -165,11 +166,11 @@ public class ProjectManagementController { @ApiOperation(value = "椤圭洰鍒楄〃锛堟帓闄ょ粌涔狅級", notes = "椤圭洰鍒楄〃锛堢敤浜庡垱寤哄疄楠岋紝鎺掗櫎缁冧範椤圭洰锛") @GetMapping("/queryManagements") Response queryManagements( - @ApiParam(name = "systemId", value = "绯荤粺id", required = true) @RequestParam(required = false) Integer systemId, - @ApiParam(name = "userId", value = "鐢ㄦ埛id", required = true) @RequestParam(required = false) Integer userId, - @ApiParam(name = "pageNo", value = "绗嚑椤碉紝椤电爜", required = true) @RequestParam Integer pageNo, - @ApiParam(name = "pageSize", value = "姣忛〉灞曠ず鐨勬暟鎹潯鏁", required = true) @RequestParam Integer pageSize, - @ApiParam(name = "projectName", value = "椤圭洰鍚嶇О", required = false) @RequestParam String projectName) { + @ApiParam(name = "systemId", value = "绯荤粺id", required = true) @RequestParam(required = false) Integer systemId, + @ApiParam(name = "userId", value = "鐢ㄦ埛id", required = true) @RequestParam(required = false) Integer userId, + @ApiParam(name = "pageNo", value = "绗嚑椤碉紝椤电爜", required = true) @RequestParam Integer pageNo, + @ApiParam(name = "pageSize", value = "姣忛〉灞曠ず鐨勬暟鎹潯鏁", required = true) @RequestParam Integer pageSize, + @ApiParam(name = "projectName", value = "椤圭洰鍚嶇О", required = false) @RequestParam(required = false) String projectName) { Response resp = new Response(); ProjectManagement vo = new ProjectManagement(); if (null != systemId) { @@ -178,10 +179,17 @@ public class ProjectManagementController { if (null != userId) { vo.setUserId(userId); } - if (null != projectName) { + + + + /*if (null != projectName) { vo.setQueryName(projectName); + }*/ + + if (org.apache.commons.lang3.StringUtils.equals("", projectName)) { + projectName = null; } - HashMap ret = service.queryManagements(vo,pageNo,pageSize); + HashMap ret = service.queryManagements(vo, pageNo, pageSize); int status = (int) ret.get("retcode"); if (status == 200) { resp.setStatus(status); @@ -194,12 +202,6 @@ public class ProjectManagementController { } - - - - - - /** * 鎵归噺鍒犻櫎 * @@ -660,16 +662,17 @@ public class ProjectManagementController { /** * 鍒ゆ柇椤圭洰鍚嶇О鏄惁瀛樺湪 + * * @param projectName * @return */ @GetMapping("/isNameExistis") - Response isNameExistis(@RequestParam String projectName){ + Response isNameExistis(@RequestParam String projectName) { Response resp = new Response(); if (StringUtils.isEmpty(projectName)) { resp.setStatus(300); resp.setMessage("椤圭洰鍚嶇О涓虹┖"); - }else{ + } else { HashMap ret = service.getByName(projectName); int status = (int) ret.get("retcode"); if (status == 200) { @@ -737,13 +740,13 @@ public class ProjectManagementController { @ApiOperation(value = "宸濆ぇ鏌ヨ椤圭洰绠＄悊鍒楄〃", notes = "宸濆ぇ鏌ヨ椤圭洰绠＄悊鍒楄〃") @GetMapping("/getManagements") Response getManagements( - @ApiParam(name = "projectPermissions", value = "椤圭洰鏉冮檺(0銆佺粌涔 1銆佽冩牳 2銆佺珵璧)", required = true) @RequestParam(required = true) Integer projectPermissions){ + @ApiParam(name = "projectPermissions", value = "椤圭洰鏉冮檺(0銆佺粌涔 1銆佽冩牳 2銆佺珵璧)", required = true) @RequestParam(required = true) Integer projectPermissions) { Response resp = new Response(); ProjectManagement vo = new ProjectManagement(); if (null == projectPermissions) { resp.setStatus(300); resp.setErrmessage("椤圭洰鏉冮檺涓嶈兘涓虹┖锛"); - }else { + } else { HashMap ret = service.getManagements(projectPermissions); int status = (int) ret.get("retcode"); if (status == 200) { @@ -759,13 +762,14 @@ public class ProjectManagementController { /** * 鏄惁鍚敤 + * * @param enable 0:鍚敤,1:绂佺敤 - * @param id 椤圭洰id + * @param id 椤圭洰id */ @ApiOperation(value = "鍚敤/绂佺敤", notes = "鍚敤/绂佺敤") @GetMapping("/enable") - public Response enable(@ApiParam(name = "enable", value = "0:鍚敤,1:绂佺敤")@RequestParam("enable") Integer enable, - @ApiParam(name = "id", value = "椤圭洰id")@RequestParam("id") Integer id) { + public Response enable(@ApiParam(name = "enable", value = "0:鍚敤,1:绂佺敤") @RequestParam("enable") Integer enable, + @ApiParam(name = "id", value = "椤圭洰id") @RequestParam("id") Integer id) { Response resp = new Response(); if (enable == null || id == null || (enable != 0 && enable != 1)) { resp.setStatus(406); diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java index 5d6be3e..0e577ee 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java @@ -25,17 +25,16 @@ public interface ProjectManagementMapper { * 鍒嗛〉鏌ヨ+鏉′欢鏌ヨ * * @param management - * @return - * "select projectId,projectName,projectPermissions,founder,creationTime,state from hr_project_management where isdel=0", - * " and projectPermissions=#{projectPermissions}", - * " and founder=#{founder}",//鏈嶅姟绔烦椤圭洰绠＄悊 - * " and (userId=#{userId} or founder = 0)",//鏁欏笀绔紝涓寮濮嬭繘鍏ラ」鐩鐞嗭紝鐪嬭鑷繁鍒涘缓鐨勫拰鍏朵粬浜虹湅瑙佺殑 - * " and founder=#{founder}",//鏁欏笀閫夋嫨鍒涘缓浜轰负绯荤粺 - * " and userId=#{userId}",//鏁欏笀閫夊垯鍒涘缓浜轰负鑰佸笀 - * " and state=#{state}", - * " and systemId=#{systemId}", - * " and projectName like concat('%',#{projectName},'%')", - * " ORDER BY creationTime desc", + * @return "select projectId,projectName,projectPermissions,founder,creationTime,state from hr_project_management where isdel=0", + * " and projectPermissions=#{projectPermissions}", + * " and founder=#{founder}",//鏈嶅姟绔烦椤圭洰绠＄悊 + * " and (userId=#{userId} or founder = 0)",//鏁欏笀绔紝涓寮濮嬭繘鍏ラ」鐩鐞嗭紝鐪嬭鑷繁鍒涘缓鐨勫拰鍏朵粬浜虹湅瑙佺殑 + * " and founder=#{founder}",//鏁欏笀閫夋嫨鍒涘缓浜轰负绯荤粺 + * " and userId=#{userId}",//鏁欏笀閫夊垯鍒涘缓浜轰负鑰佸笀 + * " and state=#{state}", + * " and systemId=#{systemId}", + * " and projectName like concat('%',#{projectName},'%')", + * " ORDER BY creationTime desc", */ @Select({""}) List queryManagements(ProjectManagement management); @@ -69,10 +68,11 @@ public interface ProjectManagementMapper { @Select({""}) List queryManagementsExportTest(ProjectManagement management); @@ -211,7 +211,7 @@ public interface ProjectManagementMapper { @Select({""}) - List getScore(Integer judgmentPointsId,Integer systemId,Integer projectId); + List getScore(Integer judgmentPointsId, Integer systemId, Integer projectId); /** @@ -310,6 +310,7 @@ public interface ProjectManagementMapper { /** * 淇敼鍒ゅ垎鐐圭粦瀹氱殑椤圭洰 + * * @param projectId * @param judgmentPointsId */ From a8212f1a6605397327c36b6034feac0c0d11878d Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Fri, 2 Apr 2021 17:06:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A7=91=E5=A4=A7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectManagementController.java | 40 ++++++++++++++++++ .../mapper/ProjectManagementMapper.java | 13 ++++++ .../service/ProjectManagementService.java | 42 +++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java index 193999a..c55c987 100644 --- a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java +++ b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java @@ -202,6 +202,46 @@ public class ProjectManagementController { } + /** + * 椤甸潰鏌ヨ,鎺掗櫎缁冧範 --- 绉戝ぇ鍒嗗紑鎺ュ彛 + *

+ * + * @param systemId + * @return + */ + @ApiOperation(value = "椤圭洰鍒楄〃锛堟帓闄ょ粌涔狅級--绉戝ぇ鍒嗗紑鎺ュ彛", notes = "椤圭洰鍒楄〃锛堢敤浜庡垱寤哄疄楠岋紝鎺掗櫎缁冧範椤圭洰锛") + @GetMapping("/KDqueryManagements") + Response KDqueryManagements( + @ApiParam(name = "systemId", value = "绯荤粺id", required = true) @RequestParam(required = false) Integer systemId, + @ApiParam(name = "userId", value = "鐢ㄦ埛id", required = true) @RequestParam(required = false) Integer userId, + @ApiParam(name = "pageNo", value = "绗嚑椤碉紝椤电爜", required = true) @RequestParam Integer pageNo, + @ApiParam(name = "pageSize", value = "姣忛〉灞曠ず鐨勬暟鎹潯鏁", required = true) @RequestParam Integer pageSize, + @ApiParam(name = "projectName", value = "椤圭洰鍚嶇О", required = false) @RequestParam(required = false) String projectName) { + Response resp = new Response(); + ProjectManagement vo = new ProjectManagement(); + if (null != systemId) { + vo.setSystemId(systemId); + } + if (null != userId) { + vo.setUserId(userId); + } + if (org.apache.commons.lang3.StringUtils.equals("", projectName)) { + projectName = null; + } + HashMap ret = service.KDqueryManagements(vo, pageNo, pageSize); + int status = (int) ret.get("retcode"); + if (status == 200) { + resp.setStatus(status); + resp.setMessage(ret.get("retvalue")); + } else { + resp.setStatus(status); + resp.setErrmessage(ret.get("retvalue").toString()); + } + return resp; + } + + + /** * 鎵归噺鍒犻櫎 * diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java index 0e577ee..951d580 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java @@ -66,6 +66,7 @@ public interface ProjectManagementMapper { // ""}) // List queryManagements(ProjectManagement management); + //绉戝ぇ鍒嗗紑鎺ュ彛 @Select({""}) + List KDqueryManagementsExportTest(ProjectManagement management); + + + + @Select({""}) List queryManagementsExportTest(ProjectManagement management); diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java index 446e775..93ae992 100644 --- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java +++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java @@ -105,6 +105,48 @@ public class ProjectManagementService { } return resp; } + + + /** + * 鏉′欢鏌ヨ ---- 绉戝ぇ鍒嗗紑鎺ュ彛 + * + * @param vo + * @return + */ + public HashMap KDqueryManagements(ProjectManagement vo, Integer pageNo, Integer pageSize) { + HashMap resp = new HashMap(); + try { + //鑾峰彇鐢ㄦ埛鐨勮鑹蹭俊鎭 + String roleId = mapper.queryRoleId(vo.getUserId()); + if (null != roleId) { + //瑙掕壊涓嶅锛堝鐢熸病鏈夋潈闄愶級 + if ("4".equals(roleId)) { + resp.put("retcode", 300); + resp.put("retvalue", "鎶辨瓑锛屾偍鐨勬潈闄愪笉鑳借闂鍦板潃锛"); + return resp; + } + //瑙掕壊绛変簬绠＄悊鍛樻垨鑰呰秴绾х鐞嗗憳 + else if ("1".equals(roleId)) { + vo.setUserId(null); + } + } + PageHelper.startPage(pageNo, pageSize); + //鏉′欢鏌ヨ + List list = mapper.KDqueryManagementsExportTest(vo); + PageInfo info = new PageInfo(list); + resp.put("retvalue", new PageResult(info.getTotal(), list)); + resp.put("retcode", 200); + } catch (Exception e) { + logger.error(e.getMessage()); + resp.put("retcode", 500); + resp.put("retvalue", "Inquiry Failed"); + return resp; + } + return resp; + } + + + /** * 鍒嗛〉鏌ヨ+鏉′欢鏌ヨ * From 4d298b4a08895cb0989d3f0fd96293ca40125491 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Tue, 6 Apr 2021 11:23:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liuwanr/entity/ProjectManagement.java | 36 +++++++++---------- .../mapper/ProjectManagementMapper.java | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java b/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java index f9b8fbf..119bfed 100644 --- a/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java +++ b/src/main/java/com/yipin/liuwanr/entity/ProjectManagement.java @@ -65,6 +65,24 @@ public class ProjectManagement { @ApiModelProperty(hidden = true) private Integer isShow; + @ApiModelProperty(value = "鏄惁鍚敤瀹為獙鏁版嵁(0鍚敤 1涓嶅惎鐢)", name = "isstartexperimental", example = "0", required = true) + private Integer isstartexperimental;//鏄惁鍚敤瀹為獙鏁版嵁(0鍚敤 1涓嶅惎鐢) + + @ApiModelProperty(value = "鏄惁鍚敤瀹為獙鎻愮ず(0鍚敤 1涓嶅惎鐢)", name = "isstartexperimentSuggests", example = "0", required = true) + private Integer isstartexperimentSuggests; + + @ApiModelProperty(value = "鐢ㄦ埛ID", name = "userId", example = "4", required = true) + private Integer userId; + + @ApiModelProperty(value = "鐭ヨ瘑鐐规槸鍚﹀惎鐢(0銆佸惎鐢 1銆佷笉灞曠ず)", name = "knowledgePointsIsEnable", example = "0", required = true) + private Integer knowledgePointsIsEnable; + + @ApiModelProperty(value = "瀹為獙浠嬬粛鏄惁鍚敤(0銆佸惎鐢 1銆佷笉灞曠ず)", name = "userId", example = "0", required = true) + private Integer experimentIntroductionIsEnable; + + @ApiModelProperty(value = "鏄惁鍚敤(0:鍚敤,1:绂佺敤)") + private Integer enable; + public Integer getPageNo() { return pageNo; } @@ -89,24 +107,6 @@ public class ProjectManagement { this.pageSize = pageSize; } - @ApiModelProperty(value = "鏄惁鍚敤瀹為獙鏁版嵁(0鍚敤 1涓嶅惎鐢)", name = "isstartexperimental", example = "0", required = true) - private Integer isstartexperimental;//鏄惁鍚敤瀹為獙鏁版嵁(0鍚敤 1涓嶅惎鐢) - - @ApiModelProperty(value = "鏄惁鍚敤瀹為獙鎻愮ず(0鍚敤 1涓嶅惎鐢)", name = "isstartexperimentSuggests", example = "0", required = true) - private Integer isstartexperimentSuggests; - - @ApiModelProperty(value = "鐢ㄦ埛ID", name = "userId", example = "4", required = true) - private Integer userId; - - @ApiModelProperty(value = "鐭ヨ瘑鐐规槸鍚﹀惎鐢(0銆佸惎鐢 1銆佷笉灞曠ず)", name = "knowledgePointsIsEnable", example = "0", required = true) - private Integer knowledgePointsIsEnable; - - @ApiModelProperty(value = "瀹為獙浠嬬粛鏄惁鍚敤(0銆佸惎鐢 1銆佷笉灞曠ず)", name = "userId", example = "0", required = true) - private Integer experimentIntroductionIsEnable; - - @ApiModelProperty(value = "鏄惁鍚敤(0:鍚敤,1:绂佺敤)") - private Integer enable; - public Integer getEnable() { return enable; } diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java index 951d580..35f64d9 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java @@ -70,7 +70,7 @@ public interface ProjectManagementMapper { @Select({""}) List queryManagements(ProjectManagement management); + + + @Select({""}) + List queryManagementsByKD(HrProjectManagement management); // @Select({"