Merge remote-tracking branch 'origin/dev_govorg' into dev

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerAgencyDTO.java

@@ -75,7 +75,7 @@ public class CustomerAgencyDTO implements Serializable {
     /**
      * 地区编码
      */
-	private Integer areaCode;
+	private String areaCode;
 
     /**
      * 删除标识

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java

@@ -20,6 +20,7 @@ package com.epmet.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 
@@ -37,7 +38,7 @@ public class AddAgencyFormDTO implements Serializable {
      * 上级机关组织Id(当前机关组织添加下级组织)
      */
     @NotBlank(message = "上级机关组织ID不能为空")
-    private String pid;
+    private String parentAgencyId;
 
     /**
      * 机构组织名称
@@ -52,27 +53,31 @@ public class AddAgencyFormDTO implements Serializable {
      * 市级: city
      * 省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
      */
+    @NotBlank(message = "机关级别不能为空")
     private String level;
 
     /**
      * 地区编码
      */
-    private Integer areaCode;
+    @NotBlank(message = "地区编码不能为空")
-
+    private String areaCode;
-    /**
-     * 国家
-     */
-    private String district;
 
     /**
      * 省份
      */
+    @NotBlank(message = "省级名称不能为空")
     private String province;
 
     /**
      * 城市
      */
+    @NotBlank(message = "市级名称不能为空")
     private String city;
 
+    /**
+     * 区县
+     */
+    @NotBlank(message = "区县名称不能为空")
+    private String district;
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java

@@ -40,11 +40,13 @@ public class AddDepartmentFormDTO implements Serializable {
     /**
      * 部门名称
      */
+    @NotBlank(message = "部门名称不能为空")
     private String departmentName;
 
     /**
      * 部门职责
      */
+    @NotBlank(message = "部门职责不能为空")
     private String departmentDuty;
 
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -20,6 +20,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AddAgencyResultDTO;
@@ -55,6 +56,7 @@ public class AgencyController {
      */
     @PostMapping("addagency")
     public Result<AddAgencyResultDTO> addAgency(@LoginUser TokenDto tokenDTO, @RequestBody AddAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return agencyService.addAgency(formDTO);
     }
 
@@ -66,6 +68,7 @@ public class AgencyController {
      */
     @PostMapping("editagency")
     public Result editAgency(@LoginUser TokenDto tokenDTO, @RequestBody EditAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return agencyService.editAgency(formDTO);
     }
 
@@ -77,6 +80,7 @@ public class AgencyController {
      */
     @PostMapping("removeagency")
     public Result removeAgency(@LoginUser TokenDto tokenDTO, @RequestBody RemoveAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return agencyService.removeAgency(formDTO);
     }
 
@@ -88,6 +92,7 @@ public class AgencyController {
      */
     @PostMapping("agencydetail")
     public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return agencyService.agencyDetail(formDTO);
     }
 
@@ -99,6 +104,7 @@ public class AgencyController {
      */
     @PostMapping("subagencylist")
     public Result<SubAgencyResultDTO> subAgencyList(@LoginUser TokenDto tokenDTO, @RequestBody SubAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return agencyService.subAgencyList(formDTO);
     }
 
@@ -110,6 +116,7 @@ public class AgencyController {
      */
     @PostMapping("agencylist")
     public Result<List<AgencyListResultDTO>> agencyList(@LoginUser TokenDto tokenDTO, @RequestBody AgencyListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return agencyService.agencyList(formDTO);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java

@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AddDepartmentResultDTO;
 import com.epmet.dto.result.DepartmentDetailResultDTO;
@@ -48,6 +49,7 @@ public class DepartmentController {
      */
     @PostMapping("adddepartment")
     public Result<AddDepartmentResultDTO> addDepartment(@LoginUser TokenDto tokenDTO, @RequestBody AddDepartmentFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return departmentService.addDepartment(formDTO);
     }
 
@@ -59,6 +61,7 @@ public class DepartmentController {
      */
     @PostMapping("editdepartment")
     public Result editDepartment(@LoginUser TokenDto tokenDTO, @RequestBody EditDepartmentFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return departmentService.editDepartment(formDTO);
     }
 
@@ -70,6 +73,7 @@ public class DepartmentController {
      */
     @PostMapping("removedepartment")
     public Result removeDepartment(@LoginUser TokenDto tokenDTO, @RequestBody RemoveDepartmentFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return departmentService.removeDepartment(formDTO);
     }
 
@@ -81,6 +85,7 @@ public class DepartmentController {
      */
     @PostMapping("departmentdetail")
     public Result<DepartmentDetailResultDTO> departmentDetail(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentdetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentDetail(formDTO);
     }
 
@@ -92,6 +97,7 @@ public class DepartmentController {
      */
     @PostMapping("departmentinagencylist")
     public Result<DepartmentInAgencyResultDTO> departmentInAgencyList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentInAgencyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentInAgencyList(formDTO);
     }
 
@@ -103,6 +109,7 @@ public class DepartmentController {
      */
     @PostMapping("departmentlist")
     public Result<List<DepartmentListResultDTO>> departmentList(@LoginUser TokenDto tokenDTO, @RequestBody DepartmentListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         return departmentService.departmentList(formDTO);
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java

@@ -75,7 +75,7 @@ public class CustomerAgencyEntity extends BaseEpmetEntity {
     /**
      * 地区编码
      */
-	private Integer areaCode;
+	private String areaCode;
 
     /**
      * 总人数

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerAgencyExcel.java

@@ -53,7 +53,7 @@ public class CustomerAgencyExcel {
     private String level;
 
     @Excel(name = "地区编码")
-    private Integer areaCode;
+    private String areaCode;
 
     @Excel(name = "删除标识")
     private String delFlag;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -132,7 +132,7 @@ public interface EpmetUserFeignClient {
 	 * @Description 根据客户Id及userId集合查询用户基本信息
 	 */
 	@PostMapping("/epmetuser/customerstaff/getdepartmentstafflist")
-	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO departmentInStaffFormDTO);
+	Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO departmentInStaffFormDTO);
 
 	/**
 	 *	根据userId查询customerId

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -28,6 +28,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.service.AgencyService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,14 +66,19 @@ public class AgencyServiceImpl implements AgencyService {
         entity.setOrganizationName(formDTO.getAgencyName());
         entity.setTotalUser(NumConstant.ZERO);
         //1:查询上级机关信息
-        CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getPid());
+        CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getParentAgencyId());
+        if (null == parentEntity) {
+            log.error(CustomerAgencyConstant.SAVE_EXCEPTION);
+            throw new RenException(CustomerAgencyConstant.SAVE_EXCEPTION);
+        }
+        entity.setPid(parentEntity.getId());
         entity.setCustomerId(parentEntity.getCustomerId());
-        if (null == parentEntity.getPid()) {
+        if (StringUtils.isBlank(parentEntity.getPid())) {
             entity.setPids(parentEntity.getId());
             entity.setAllParentName(parentEntity.getOrganizationName());
         } else {
-            entity.setPids(":" + parentEntity.getId());
+            entity.setPids(parentEntity.getPids()+":" + parentEntity.getId());
-            entity.setAllParentName("-" + parentEntity.getOrganizationName());
+            entity.setAllParentName(parentEntity.getAllParentName()+"-" + parentEntity.getOrganizationName());
         }
         //2:保存组织信息
         if (customerAgencyDao.insert(entity) < NumConstant.ONE) {
@@ -121,7 +127,14 @@ public class AgencyServiceImpl implements AgencyService {
             result.setMsg(EpmetErrorCode.NOT_DEL_AGENCY.getMsg());
             return result;
         }
-        //2:删除当前机关组织（逻辑删）
+        //2:不存在下级机关，本级存在工作人员的不能删除
+        CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getAgencyId());
+        if (null != entity && entity.getTotalUser() > NumConstant.ZERO) {
+            result.setCode(EpmetErrorCode.NOT_DEL_AGENCY_PER.getCode());
+            result.setMsg(EpmetErrorCode.NOT_DEL_AGENCY_PER.getMsg());
+            return result;
+        }
+        //3:删除当前机关组织（逻辑删）
         if (customerAgencyDao.deleteById(formDTO.getAgencyId()) < NumConstant.ONE) {
             log.error(CustomerAgencyConstant.DEL_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION);

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/epmet_gov_org.sql

@@ -111,3 +111,5 @@ ALTER TABLE customer_agency ADD (
 	CITY VARCHAR (32) DEFAULT NULL COMMENT '城市',
 	DISTRICT VARCHAR (32) DEFAULT NULL COMMENT '区县'
 );
+
+ALTER TABLE customer_agency MODIFY AREA_CODE VARCHAR(10) NOT NULL;

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@@ -3,20 +3,27 @@
 
 <mapper namespace="com.epmet.dao.CustomerDepartmentDao">
 
-    <resultMap type="com.epmet.entity.CustomerDepartmentEntity" id="customerDepartmentMap">
+    <select id="selectDepartmentListByAgencyId" resultType="com.epmet.dto.result.DepartmentListResultDTO">
-        <result property="id" column="ID"/>
+        SELECT
-        <result property="customerId" column="CUSTOMER_ID"/>
+            id AS 'departmentId',
-        <result property="agencyId" column="AGENCY_ID"/>
+            department_name AS 'departmentName',
-        <result property="departmentName" column="DEPARTMENT_NAME"/>
+            total_user AS 'totalUser'
-        <result property="departmentDuty" column="DEPARTMENT_DUTY"/>
+        FROM customer_department
-        <result property="totalUser" column="TOTAL_USER"/>
+        WHERE del_flag = '0'
-        <result property="delFlag" column="DEL_FLAG"/>
+        AND agency_id = #{agencyId}
-        <result property="revision" column="REVISION"/>
+        ORDER BY created_time DESC
-        <result property="createdBy" column="CREATED_BY"/>
+        LIMIT 10
-        <result property="createdTime" column="CREATED_TIME"/>
+    </select>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
 
+    <select id="selectDepartmentList" resultType="com.epmet.dto.result.DepartmentListResultDTO">
+        SELECT
+            id AS 'departmentId',
+            department_name AS 'departmentName',
+            total_user AS 'totalUser'
+        FROM customer_department
+        WHERE del_flag = '0'
+        AND agency_id = #{agencyId}
+        ORDER BY created_time DESC
+    </select>
 
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -186,7 +186,7 @@ public class CustomerStaffController {
      * @Description 根据客户Id及userId集合查询用户基本信息
      */
     @PostMapping("getdepartmentstafflist")
-    public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO fromDTO) {
+    public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(@RequestBody DepartmentInStaffFormDTO fromDTO) {
         return customerStaffService.getDepartmentStaffList(fromDTO);
     }