From 4cb48d1c5f3c2c183ba5199026825b1eb27a22df Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 8 Feb 2020 09:55:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/ParamsFeignClient.java | 2 +- .../esua/epdc/feign/ResourceFeignClient.java | 2 +- .../esua/epdc/feign/UserFeignClient.java | 2 +- esua-epdc/epdc-gateway/pom.xml | 29 ++++++----- .../esua/epdc/feign/ResourceFeignClient.java | 2 +- .../esua/epdc/feign/ActInfoFeignClient.java | 2 +- .../EvaluateUpdateDeptOfficerCountDTO.java | 51 +++++++++++++++++++ .../evaluate/dao/EvaluateOfficerDao.java | 19 +++++++ .../impl/EvaluateOfficerServiceImpl.java | 25 +++++++-- .../mapper/evaluate/EvaluateOfficerDao.xml | 12 +++++ .../src/main/resources/application.yml | 2 +- .../src/main/resources/generator.properties | 2 +- 12 files changed, 126 insertions(+), 24 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java index 7e5ae3941..6862e3776 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Mark sunlightcs@gmail.com * @since 1.1.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class,url = "http://127.0.0.1:9092") public interface ParamsFeignClient { /** diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index 8077f0782..175fbedaa 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java @@ -22,7 +22,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient",url = "http://127.0.0.1:9092") public interface ResourceFeignClient { /** * 获取所有资源列表 diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 9b3557e17..ca9671b3f 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -28,7 +28,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient",url = "http://127.0.0.1:9092") public interface UserFeignClient { /** diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index a153a845b..3618c936c 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -98,21 +98,26 @@ elink@888 - lb://epdc-auth-server - lb://epdc-admin-server + + http://127.0.0.1:9091 + - lb://epdc-activiti-server - + lb://epdc-activiti-server + + + + http://127.0.0.1:9092 + lb://epdc-activiti-server http://127.0.0.1:9040 lb://epdc-app-server - lb://epdc-heart-server - + + http://127.0.0.1:9060 lb://epdc-job-server - lb://epdc-message-server - + + http://127.0.0.1:9062 http://127.0.0.1:9064 lb://epdc-oss-server @@ -121,14 +126,14 @@ lb://epdc-services-server - - http://127.0.0.1:9068 + lb://epdc-user-server + lb://epdc-demo-server http://127.0.0.1:9063 lb://epdc-websocket-server - - lb://epdc-custom-server + + http://127.0.0.1:9076 lb://epdc-points-server http://127.0.0.1:9069 diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index b52b556f8..1c378fd9d 100644 --- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class,url = "http://127.0.0.1:9091") public interface ResourceFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index 95fd6e0e1..15c6742f8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java @@ -58,7 +58,7 @@ public interface ActInfoFeignClient { Result getRejectDetail(ActInfoAppFormDTO formDto); @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getCancelDetail(@PathVariable String id); + Result getCancelDetail(@PathVariable("id") String id); @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getBannerList(); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java new file mode 100644 index 000000000..bc237a07b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java @@ -0,0 +1,51 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.evaluate; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 评价部门表 评价部门表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-02-05 + */ +@Data +public class EvaluateUpdateDeptOfficerCountDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 部门ID + */ + private String deptId; + + /** + * 干部人数 + */ + private Integer officerCount; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java index fed3f2b48..8791c4f8c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.evaluate.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; +import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity; @@ -66,4 +67,22 @@ public interface EvaluateOfficerDao extends BaseDao { List getEvaluateOfficerCount(Map params); List getDeptOfficer(Map params); + + /** + * 街道干部管理表干部人数加1 + * @param deptId + */ + void officerCountAddOne(@Param("deptId")String deptId); + + /** + * 街道干部管理表干部人数减少对应数量 + * @param evaluateUpdateDeptOfficerCountDTO + */ + void updateOfficerCount(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); + + /** + * 导入操作时更新街道干部管理表干部人数 + * @param evaluateUpdateDeptOfficerCountDTO + */ + void updateOfficerCountByDeptId(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java index 8cdeb3eed..7ab89ede4 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java @@ -26,10 +26,10 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO; +import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO; import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; @@ -52,10 +52,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.*; @@ -166,7 +162,11 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl + + update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT+1 where DEPT_ID = #{deptId} + + + + update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT- #{officerCount} where DEPT_ID = (select eeo.DEPT_ID from epdc_evaluate_officer eeo where eeo.id = #{id}) + + + + update epdc_evaluate_dept set OFFICER_COUNT = #{officerCount} where DEPT_ID = #{deptId} + + diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index 91fe3458c..b014c4c3a 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: epdc password: elink833066 #oracle配置 diff --git a/renren-cloud-generator/src/main/resources/generator.properties b/renren-cloud-generator/src/main/resources/generator.properties index 9e9f68440..0490a3067 100644 --- a/renren-cloud-generator/src/main/resources/generator.properties +++ b/renren-cloud-generator/src/main/resources/generator.properties @@ -3,7 +3,7 @@ main= #\u5305\u540D package=com.elink.esua.epdc -moduleName=kpi +moduleName=custom #\u4F5C\u8005 author=qu #\u7248\u672C\u53F7 From f5b44f129f9cd33a0d1ef65cfa8dca5331077453 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 8 Feb 2020 10:15:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=B9=8B=E5=89=8D=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/feign/ParamsFeignClient.java | 2 +- .../esua/epdc/feign/ResourceFeignClient.java | 2 +- .../esua/epdc/feign/UserFeignClient.java | 2 +- esua-epdc/epdc-gateway/pom.xml | 29 ++++++++----------- .../esua/epdc/feign/ResourceFeignClient.java | 2 +- .../esua/epdc/feign/ActInfoFeignClient.java | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/generator.properties | 2 +- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java index 6862e3776..7e5ae3941 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Mark sunlightcs@gmail.com * @since 1.1.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class,url = "http://127.0.0.1:9092") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class) public interface ParamsFeignClient { /** diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index 175fbedaa..8077f0782 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java @@ -22,7 +22,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient",url = "http://127.0.0.1:9092") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient") public interface ResourceFeignClient { /** * 获取所有资源列表 diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index ca9671b3f..9b3557e17 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -28,7 +28,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient",url = "http://127.0.0.1:9092") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient") public interface UserFeignClient { /** diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index 3618c936c..a153a845b 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -98,26 +98,21 @@ elink@888 - - http://127.0.0.1:9091 - + lb://epdc-auth-server + lb://epdc-admin-server - lb://epdc-activiti-server - - - - http://127.0.0.1:9092 - lb://epdc-activiti-server + lb://epdc-activiti-server + http://127.0.0.1:9040 lb://epdc-app-server - - http://127.0.0.1:9060 + lb://epdc-heart-server + lb://epdc-job-server - - http://127.0.0.1:9062 + lb://epdc-message-server + http://127.0.0.1:9064 lb://epdc-oss-server @@ -126,14 +121,14 @@ lb://epdc-services-server - lb://epdc-user-server - + + http://127.0.0.1:9068 lb://epdc-demo-server http://127.0.0.1:9063 lb://epdc-websocket-server - - http://127.0.0.1:9076 + + lb://epdc-custom-server lb://epdc-points-server http://127.0.0.1:9069 diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index 1c378fd9d..b52b556f8 100644 --- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class,url = "http://127.0.0.1:9091") +@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class) public interface ResourceFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index 15c6742f8..95fd6e0e1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java @@ -58,7 +58,7 @@ public interface ActInfoFeignClient { Result getRejectDetail(ActInfoAppFormDTO formDto); @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getCancelDetail(@PathVariable("id") String id); + Result getCancelDetail(@PathVariable String id); @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getBannerList(); diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index b014c4c3a..91fe3458c 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: epdc password: elink833066 #oracle配置 diff --git a/renren-cloud-generator/src/main/resources/generator.properties b/renren-cloud-generator/src/main/resources/generator.properties index 0490a3067..9e9f68440 100644 --- a/renren-cloud-generator/src/main/resources/generator.properties +++ b/renren-cloud-generator/src/main/resources/generator.properties @@ -3,7 +3,7 @@ main= #\u5305\u540D package=com.elink.esua.epdc -moduleName=custom +moduleName=kpi #\u4F5C\u8005 author=qu #\u7248\u672C\u53F7 From 85dcdb3c06ac27fc604692bcd1e91b310e0eda42 Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 8 Feb 2020 10:29:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1=E7=9B=B8=E5=85=B3=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E3=80=82=E5=8F=AF=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=9B=E5=85=B6=E4=BB=96=E6=96=B9=E6=B3=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/utils/ModuleUtils.java | 7 +++++++ .../elink/esua/epdc/feign/KpiFeignClient.java | 5 +++-- .../fallback/KpiFeignClientFallBack.java | 4 ++-- .../epdc/service/ScheduleJobKpiService.java | 5 +++-- .../impl/ScheduleJobKpiServiceImpl.java | 8 ++++---- .../esua/epdc/task/KpiManualScoreTask.java | 7 +++---- .../esua/epdc/dto/ScheduleJobParamDTO.java | 10 +++++----- .../controller/KpiManualScoreController.java | 6 +++--- .../epdc/service/KpiManualScoreService.java | 2 +- .../impl/KpiManualScoreServiceImpl.java | 19 ++++++++++++------- .../esua/epdc/utils/KpiLocalDateUtils.java | 2 -- 11 files changed, 43 insertions(+), 32 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java index d6caa9b0f..3c75b2837 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.CharEncoding; import org.springframework.util.Base64Utils; +import org.springframework.util.StringUtils; import java.io.UnsupportedEncodingException; import java.text.ParseException; @@ -59,6 +60,9 @@ public class ModuleUtils { * @date 2020/2/6 16:39 */ public static String encodeByBase64(String params) { + if (StringUtils.isEmpty(params)) { + return null; + } try { return Base64Utils.encodeToUrlSafeString(params.getBytes(CharEncoding.UTF_8)); } catch (UnsupportedEncodingException e) { @@ -75,6 +79,9 @@ public class ModuleUtils { * @date 2020/2/6 16:48 */ public static String decodeFromBase64(String base64Str) { + if (StringUtils.isEmpty(base64Str)) { + return null; + } try { return new String(Base64Utils.decodeFromUrlSafeString(base64Str), CharEncoding.UTF_8); } catch (UnsupportedEncodingException e) { diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java index 61b783185..b4c17cbbb 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java @@ -39,10 +39,11 @@ public interface KpiFeignClient { /** * 将手动打分存入元数据表 * + * @param params * @return void * @author work@yujt.net.cn * @date 2019/12/25 14:06 */ - @GetMapping("kpi/manualScore/initMetaData") - Result manualScoreToMetaData(); + @GetMapping("kpi/manualScore/initMetaData/{params}") + Result manualScoreToMetaData(@PathVariable("params") String params); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java index 7dd9ef2ad..8c3d024a3 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java @@ -21,7 +21,7 @@ public class KpiFeignClientFallBack implements KpiFeignClient { } @Override - public Result manualScoreToMetaData() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", ""); + public Result manualScoreToMetaData(String params) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", params); } } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java index dc6ba6803..0899e7aff 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java @@ -24,14 +24,15 @@ public interface ScheduleJobKpiService { * @author work@yujt.net.cn * @date 2019/12/17 14:43 */ - void startTaskByRuleCode(String ruleCode); + void startTaskByRuleCode(String params); /** * 将手动打分存入元数据表 * + * @param jobParams * @return void * @author work@yujt.net.cn * @date 2019/12/25 14:05 */ - void manualScoreToMetaData(); + void manualScoreToMetaData(String jobParams); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java index eb0d5231f..fd6e2defe 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java @@ -23,13 +23,13 @@ public class ScheduleJobKpiServiceImpl implements ScheduleJobKpiService { } @Override - public void startTaskByRuleCode(String ruleCode) { - kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(ruleCode)); + public void startTaskByRuleCode(String params) { + kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(params)); } @Override - public void manualScoreToMetaData() { - kpiFeignClient.manualScoreToMetaData(); + public void manualScoreToMetaData(String params) { + kpiFeignClient.manualScoreToMetaData(ModuleUtils.encodeByBase64(params)); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java index acdc82955..613b2e967 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.task; import com.elink.esua.epdc.service.ScheduleJobKpiService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -19,13 +18,13 @@ public class KpiManualScoreTask implements ITask { /** * 将手动打分存入元数据表 - * @param ruleCode + * @param jobParams * @return void * @author work@yujt.net.cn * @date 2019/12/25 14:02 */ @Override - public void run(String ruleCode) { - kpiService.manualScoreToMetaData(); + public void run(String jobParams) { + kpiService.manualScoreToMetaData(jobParams); } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java index 83c454ae4..82b0a2b41 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java @@ -34,11 +34,11 @@ public class ScheduleJobParamDTO { ScheduleJobParamDTO scheduleJobParam; try { scheduleJobParam = JSONObject.parseObject(params, ScheduleJobParamDTO.class); - String dateStr = scheduleJobParam.getDateStr(); - if (StringUtils.isBlank(dateStr)) { - scheduleJobParam.setDateStr(null); - } else if (!ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) { - scheduleJobParam.setDateStr(null); + if (null != scheduleJobParam) { + String dateStr = scheduleJobParam.getDateStr(); + if (StringUtils.isBlank(dateStr) || !ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) { + scheduleJobParam.setDateStr(null); + } } } catch (Exception e) { log.error("定时任务参数格式错误，错误参数：{}", params); diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java index b89448a82..81976c768 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java @@ -143,9 +143,9 @@ public class KpiManualScoreController { * @author work@yujt.net.cn * @date 2019/12/25 14:10 */ - @GetMapping("initMetaData") - public Result initManualScoreToMetaData() { - kpiManualScoreService.initManualScoreToMetaData(); + @GetMapping("initMetaData/{params}") + public Result initManualScoreToMetaData(@PathVariable("params") String params) { + kpiManualScoreService.initManualScoreToMetaData(params); return new Result(); } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java index 2b2fb45d2..4a73c7804 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java @@ -141,5 +141,5 @@ public interface KpiManualScoreService extends BaseService * @author work@yujt.net.cn * @date 2019/12/25 14:11 */ - void initManualScoreToMetaData(); + void initManualScoreToMetaData(String params); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java index 141be68a9..e92d04823 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java @@ -18,6 +18,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.KpiFieldConstant; import com.elink.esua.epdc.dao.*; @@ -723,10 +724,11 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl Date: Sat, 8 Feb 2020 10:57:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=88=B1=E5=BF=83?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/service/impl/ActUserClockLogServiceImpl.java | 4 +++- .../main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java | 3 ++- .../epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java | 3 ++- .../esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java | 3 ++- .../java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java | 3 ++- .../java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java | 3 ++- .../esua/epdc/service/impl/VolunteerInfoServiceImpl.java | 2 -- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java index 481902700..339b55b10 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java @@ -46,6 +46,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -297,7 +298,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl Date: Sat, 8 Feb 2020 11:09:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?banner=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=9A=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F=20=E6=8B=9B=E5=8B=9F?= =?UTF-8?q?=E4=BB=A4=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=9A=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F=EF=BC=8C=E6=9C=80=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=9A=84=E5=9C=A8=E6=9C=80=E4=B8=8A=E8=BE=B9=20?= =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E8=A7=84=E5=88=99=EF=BC=9A=E6=B4=BB=E5=8A=A8=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E6=AD=A3=E5=BA=8F=EF=BC=8C=E6=9C=80?= =?UTF-8?q?=E6=96=B0=EF=BC=88=E6=9C=80=E8=BF=91=E3=80=81=E6=9C=80=E5=BF=AB?= =?UTF-8?q?=EF=BC=89=E5=BC=80=E5=A7=8B=E7=9A=84=EF=BC=8C=E5=9C=A8=E6=9C=80?= =?UTF-8?q?=E4=B8=8A=E8=BE=B9=20=E5=B7=B2=E6=8A=A5=E5=90=8D=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=9A=E7=94=A8=E6=88=B7=E6=8A=A5=E5=90=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F=EF=BC=8C=E6=9C=80=E6=96=B0=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=9C=A8=E6=9C=80=E4=B8=8A=E8=BE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activity/dao/ActBannerDao.java | 9 ++++++ .../service/impl/ActBannerServiceImpl.java | 5 ++-- .../mapper/activity/ActBannerDao.xml | 29 +++++++++++++++++++ .../resources/mapper/activity/ActInfoDao.xml | 14 +++++---- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index 5dc823228..190060322 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java @@ -66,4 +66,13 @@ public interface ActBannerDao extends BaseDao { * @since 2020/2/6 21:24 */ void updateBannerByActId(String actId); + + /** + * @Description: 手机端banner查询，根据创建时间 正序排列 + * @Param: [params] + * @return: java.util.List + * @Author: zy + * @Date: 2020-02-08 + */ + List getAppActBannerlist(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index e5d5ebe52..4a16fe7bd 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -69,9 +69,8 @@ public class ActBannerServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActBannerDTO.class); + List entityList = baseDao.getAppActBannerlist(params); + return entityList; } private QueryWrapper getWrapper(Map params) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 51fff403b..db4c75ee5 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -80,4 +80,33 @@ UPDATE epdc_act_banner SET `STATUS` = '0' WHERE ACT_ID = #{actId} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index fc6c35fdd..32a66a764 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -185,17 +185,19 @@ #{timestamp} + + AND ID = #{actId} + = ]]> #{timestamp} + ORDER BY + actInfo.PUBLISH_TIME DESC #{timestamp} + ORDER BY + actInfo.ACT_START_TIME - - AND ID = #{actId} - - ORDER BY - actInfo.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} From 49a0be6615b0439d213e5c9eef33b36e119daed3 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Sat, 8 Feb 2020 11:48:20 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/dao/EvaluateOfficerDao.java | 9 ++++++ .../evaluate/excel/EvaluateOfficerExcel.java | 2 +- .../impl/EvaluateOfficerServiceImpl.java | 18 +++++------ .../mapper/evaluate/EvaluateOfficerDao.xml | 30 +++++++++++++++++++ 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java index 8791c4f8c..746c4febc 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java @@ -85,4 +85,13 @@ public interface EvaluateOfficerDao extends BaseDao { * @param evaluateUpdateDeptOfficerCountDTO */ void updateOfficerCountByDeptId(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); + + // 清空该人员相关评价数据 + void deleteEvaluateInfoById(@Param("ids")String[] ids); + + void deleteEvaluateDetailById(@Param("ids")String[] ids); + + void deleteEvaluateDetailByDeptId(@Param("deptId")String deptId); + + void deleteEvaluateInfoByDeptId(@Param("deptId")String deptId); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java index ccefeb684..352dd730a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java @@ -38,7 +38,7 @@ public class EvaluateOfficerExcel { @Excel(name = "干部姓名") private String fullName; - @Excel(name = "性别") + @Excel(name = "性别", replace = {"女_0","男_1"}) private String sex; @Excel(name = "单位职务") diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java index 7ab89ede4..0178f4f71 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java @@ -130,16 +130,6 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); - for(int i = 0 ; i < entityList.size() ; i++){ - EvaluateOfficerEntity entity = entityList.get(i); - //转型性别 - String sex = entity.getSex(); - if("0".equals(sex)){ - entity.setSex("女"); - }else{ - entity.setSex("男"); - } - } return ConvertUtils.sourceToTarget(entityList, EvaluateOfficerDTO.class); } @@ -194,6 +184,11 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl + + delete from epdc_evaluate_info where OFFICER_ID in + + #{id} + + + + + delete from epdc_evaluate_detail where INFO_ID in ( + select ID from epdc_evaluate_info where OFFICER_ID in + + #{id} + + ) + + + + delete from epdc_evaluate_info where OFFICER_ID in ( + select ID from epdc_evaluate_officer where DEPT_ID = #{deptId} + ) + + + + delete from epdc_evaluate_detail where INFO_ID in ( + select ID from epdc_evaluate_info where OFFICER_ID in ( + select ID from epdc_evaluate_officer where DEPT_ID = #{deptId} + ) + ) + +