From b6bc63bb2a66adad7747bec17d182af984ac1dfd Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 14 Dec 2020 16:54:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?screen=5Fcpc=5Fbase=5Fdata=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8E=BB=E9=99=A4dateId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/evaluationindex/screen/ScreenCpcBaseDataDao.java | 3 +-- .../extract/toscreen/impl/PartyBaseInfoServiceImpl.java | 2 +- .../evaluationindex/screen/ScreenCpcBaseDataService.java | 3 +-- .../screen/impl/ScreenCpcBaseDataServiceImpl.java | 5 ++--- .../mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml | 1 - 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java index 716d9b2cfb..f33cd46393 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java @@ -69,12 +69,11 @@ public interface ScreenCpcBaseDataDao extends BaseDao { /** * @Description 删除旧的党员基本信息 * @param customerId - * @param dateId * @param orgIds * @author zxc * @date 2020/9/22 3:28 下午 */ - Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("dateId") String dateId,@Param("orgIds")List orgIds); + Integer deleteOldPartyBaseInfo(@Param("customerId") String customerId,@Param("orgIds")List orgIds); /** * @Description 查询党员信息【根据agencyId来查】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java index 90ccb5a0ed..f0999a4605 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyBaseInfoServiceImpl.java @@ -319,7 +319,7 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService { } Integer delNum; do { - delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, dateId, orgIds); + delNum = cpcBaseDataService.deleteOldPartyBaseInfo(customerId, orgIds); }while (delNum > NumConstant.ZERO); List> partition = ListUtils.partition(finalResult, NumConstant.ONE_HUNDRED); partition.forEach(p -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java index 314bd3181a..de2b431ded 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java @@ -43,12 +43,11 @@ public interface ScreenCpcBaseDataService extends BaseService orgIds); + Integer deleteOldPartyBaseInfo(String customerId, List orgIds); /** * @Description 查询党员信息【根据agencyId来查】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java index 7505476087..5c0ec9a676 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java @@ -51,14 +51,13 @@ public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl orgIds) { - return baseDao.deleteOldPartyBaseInfo(customerId, dateId,orgIds); + public Integer deleteOldPartyBaseInfo(String customerId, List orgIds) { + return baseDao.deleteOldPartyBaseInfo(customerId,orgIds); } /** diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml index 9de96650b5..e059bc271e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml @@ -187,7 +187,6 @@ delete from screen_cpc_base_data where CUSTOMER_ID = #{customerId} - and DATA_END_TIME = #{dateId} and ( From 5e625c6e2dd66054a3158e2ca74ecc0fc6d4a5b2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Dec 2020 17:36:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?selectDifficulty=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9EVENT=5FCATEGORY=5FNAME=E4=B8=BAnull=E8=BF=94=E5=9B=9E?= =?UTF-8?q?''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenDifficultyDataDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml index a342420f2d..dc1320fa4d 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml @@ -12,7 +12,7 @@ ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours, diff.EVENT_SOURCE AS gridName, diff.EVENT_IMG_URL AS imgUrl, - diff.EVENT_CATEGORY_NAME AS categoryName, + IFNULL(diff.EVENT_CATEGORY_NAME,'') AS categoryName, diff.EVENT_RE_ORG AS handleDepts, diff.EVENT_RE_ORG AS handleCount FROM From ca3d09ef98aeedb9e9a5f0f6f897d035fe9257f3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 14 Dec 2020 18:04:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=86=E5=B8=83=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 2 +- .../main/resources/mapper/screen/ScreenCustomerGridDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 8dd92ec0d1..9d5338ac65 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -73,7 +73,7 @@ SELECT sutd.org_id AS subId, - scg.center_mark AS centerMark, + IFNULL(scg.center_mark,'') AS centerMark, sutd.user_total AS totalNum, scg.area_marks AS areaMarks, scg.grid_name AS subName, From 830f2b6c328074a33374befe092b88aedbb975c9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Dec 2020 10:50:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E3=80=81=E7=BD=91=E6=A0=BC=E3=80=81=E7=BB=84=E7=BB=87=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=BD=91=E6=A0=BC=E4=BF=A1=E6=81=AFsql?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=9C=80=E6=9B=B4?= =?UTF-8?q?=E6=96=B0UPDATED=5FTIME=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/CustomerAgencyDao.java | 10 ++++++++++ .../java/com/epmet/dao/CustomerDepartmentDao.java | 12 ++++++++++-- .../com/epmet/service/impl/AgencyServiceImpl.java | 6 ++++-- .../epmet/service/impl/DepartmentServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/CustomerAgencyDao.xml | 8 ++++++++ .../main/resources/mapper/CustomerDepartmentDao.xml | 8 ++++++++ .../src/main/resources/mapper/CustomerGridDao.xml | 6 ++++-- 7 files changed, 49 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 9c1735a886..c1478df01d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -206,4 +206,14 @@ public interface CustomerAgencyDao extends BaseDao { * @author sun **/ List selectAllSub(@Param("agencyId") String agencyId); + + /** + * @param agencyId 组织id + * @param operateUserId 当前操作人 + * @return int + * @author yinzuomei + * @description + * @Date 2020/12/15 10:04 + **/ + int delByAgencyId(@Param("agencyId") String agencyId, @Param("operateUserId") String operateUserId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java index 12d2b81c7e..eedb383a94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java @@ -18,12 +18,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerDepartmentDTO; import com.epmet.dto.CustomerIdDTO; import com.epmet.dto.result.AgencyDeptList; import com.epmet.dto.result.DepartmentListResultDTO; -import com.epmet.dto.result.SubListResultDTO; import com.epmet.entity.CustomerDepartmentEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -93,4 +91,14 @@ public interface CustomerDepartmentDao extends BaseDao * @return void */ void deleteStaffDep(@Param("staffId") String staffId); + + /** + * @return int + * @param deptId 部门id + * @param operateUserId 当前操作人id + * @author yinzuomei + * @description + * @Date 2020/12/15 10:05 + **/ + int delDeptById(@Param("deptId")String deptId,@Param("operateUserId") String operateUserId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index afb9739daa..cc04700841 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerAgencyConstant; @@ -67,7 +68,8 @@ public class AgencyServiceImpl implements AgencyService { private StaffServiceImpl staffServiceImpl; @Autowired private CustomerGridDao customerGridDao; - + @Autowired + private LoginUserUtil loginUserUtil; /** * @param formDTO * @return @@ -199,7 +201,7 @@ public class AgencyServiceImpl implements AgencyService { return result; } //4:删除当前机关组织(逻辑删) - if (customerAgencyDao.deleteById(formDTO.getAgencyId()) < NumConstant.ONE) { + if (customerAgencyDao.delByAgencyId(formDTO.getAgencyId(),loginUserUtil.getLoginUserId()) < NumConstant.ONE) { log.error(CustomerAgencyConstant.DEL_EXCEPTION); throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 3e8dbaf9d1..5b53e49d0b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -21,16 +21,16 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerDepartmentConstant; import com.epmet.dao.CustomerAgencyDao; import com.epmet.dao.CustomerDepartmentDao; import com.epmet.dao.CustomerStaffDepartmentDao; -import com.epmet.dto.CustomerIdDTO; import com.epmet.dto.CustomerDepartmentDTO; +import com.epmet.dto.CustomerIdDTO; import com.epmet.dto.CustomerStaffDepartmentDTO; -import com.epmet.dto.StaffRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; @@ -49,7 +49,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -73,7 +72,8 @@ public class DepartmentServiceImpl implements DepartmentService { private CustomerStaffDepartmentService customerStaffDepartmentService; @Autowired private EpmetUserFeignClient epmetUserFeignClient; - + @Autowired + private LoginUserUtil loginUserUtil; /** * @param formDTO * @return @@ -139,7 +139,7 @@ public class DepartmentServiceImpl implements DepartmentService { return result; } //2:删除部门信息(逻辑删) - if (customerDepartmentDao.deleteById(formDTO.getDepartmentId()) < NumConstant.ONE) { + if (customerDepartmentDao.delDeptById(formDTO.getDepartmentId(),loginUserUtil.getLoginUserId()) < NumConstant.ONE) { log.error(CustomerDepartmentConstant.DEL_EXCEPTION); throw new RenException(CustomerDepartmentConstant.DEL_EXCEPTION); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index b85f892aa1..665fcba28f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -381,4 +381,12 @@ + + + update customer_agency + set updated_by = #{operateUserId}, + del_flag = '1', + UPDATED_TIME=NOW() + where id=#{agencyId} + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml index bf175e9127..fbfbe06478 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml @@ -76,4 +76,12 @@ AND ca.del_flag = '0' AND cd.agency_id = #{agencyId} + + + update customer_department + set updated_by = #{operateUserId}, + del_flag = '1', + UPDATED_TIME=NOW() + where id=#{deptId} + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 99f24e8b85..b3e93a2fc3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -194,7 +194,8 @@ set grid_name = #{gridName}, manage_district = #{manageDistrict}, - updated_by = #{updatedBy} + updated_by = #{updatedBy}, + UPDATED_TIME=NOW() where id = #{id} @@ -205,7 +206,8 @@ customer_grid set updated_by = #{userId}, - del_flag = 1 + del_flag = 1, + UPDATED_TIME=NOW() where id = #{gridId} From 410488a7673c41bbcf1fcf4b42b660da03290dfb Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 15 Dec 2020 14:43:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B0=86REGISTER=20=3D=20'1'=E6=94=B9?= =?UTF-8?q?=E4=B8=BAFIRST=5FREGISTER=20=3D=20'1'=EF=BC=8C=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=8E=89=E4=B9=8B=E5=89=8D=E5=9B=A0=E8=B7=A8=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BA=A7=E7=94=9F=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/user/UserDao.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index 90c573cb4a..a441145bb4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -21,7 +21,7 @@ - AND REGISTER = '1' + AND FIRST_REGISTER = '1' @@ -56,7 +56,7 @@ - AND REGISTER = '1' + AND FIRST_REGISTER = '1' @@ -95,7 +95,7 @@ - AND REGISTER = '1' + AND FIRST_REGISTER = '1' @@ -135,7 +135,7 @@ - AND REGISTER = '1' + AND FIRST_REGISTER = '1' @@ -303,7 +303,7 @@ - AND REGISTER = '1' + AND FIRST_REGISTER = '1' @@ -336,7 +336,7 @@ - AND REGISTER = '1' + AND FIRST_REGISTER = '1'