Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -23,6 +23,7 @@ public enum DictTypeEnum {
     PATROL_WORK_TYPE("patrol_work_type", "例行工作分类", 13),
     GRID_TYPE("grid_type", "网格类型", 12),
     ITEM_TYPE_QUERY("item_type_query","居民信息组件查询方式",14),
+    SELF_ORG_CATEGORY("self_org_category","社区自组织分类",15),
     ;
 
     private final String code;

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import com.epmet.dto.IcCommunitySelfOrganizationPersonnelDTO;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -18,36 +20,40 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
 
     private static final long serialVersionUID = -4996925380900678065L;
 
-    public interface AddCommunitySelfOrganizationForm{}
+    public interface AddCommunitySelfOrganizationForm extends CustomerClientShowGroup {}
 
     /**
      * 组织名称
      */
-    @NotBlank(message = "organizationName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "组织名称不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @Length(max = 50,message = "组织名称最多输入50字",groups = AddCommunitySelfOrganizationForm.class)
     private String organizationName;
 
+    @NotBlank(message = "分类不能为空", groups = AddCommunitySelfOrganizationForm.class)
+    private String categoryCode;
+
     /**
      * 组织人数
      */
-    @NotNull(message = "organizationPersonCount不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotNull(message = "组织人数不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private Integer organizationPersonCount;
 
     /**
      * 负责人姓名
      */
-    @NotBlank(message = "principalName不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "负责人不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private String principalName;
 
     /**
      * 负责人电话
      */
-    @NotBlank(message = "principalPhone不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "联系电话",groups = AddCommunitySelfOrganizationForm.class)
     private String principalPhone;
 
     /**
      * 服务事项
      */
-    @NotBlank(message = "serviceItem不能为空",groups = AddCommunitySelfOrganizationForm.class)
+    @NotBlank(message = "服务事项不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private String serviceItem;
 
     /**
@@ -63,6 +69,7 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable {
     /**
      * 经度
      */
+    @NotBlank(message = "位置坐标不能为空",groups = AddCommunitySelfOrganizationForm.class)
     private String longitude;
 
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java

@@ -26,6 +26,12 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable {
     @NotBlank(message = "organizationName不能为空",groups = EditCommunitySelfOrganizationForm.class)
     private String organizationName;
 
+    /**
+     * 分类编码
+     */
+    @NotBlank(message = "categoryCode不能为空",groups = EditCommunitySelfOrganizationForm.class)
+    private String categoryCode;
+
     /**
      * 组织人数
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java

@@ -33,6 +33,15 @@ public class CommunitySelfOrganizationListDTO implements Serializable {
      */
     private String organizationName;
 
+    /**
+     * 分类，来源于字典表dictType=self_org_category;
+     */
+    private String categoryCode;
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
     /**
      * 服务事项
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java

@@ -67,6 +67,11 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity {
      */
 	private String organizationName;
 
+    /**
+     * 分类，来源于字典表dictType=self_org_category;
+     */
+	private String categoryCode;
+
     /**
      * 组织人数
      */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java

@@ -15,6 +15,9 @@ public class ExportCommunitySelfOrganizationExcel {
     @Excel(name = "组织名称", width = 40, needMerge = true)
     private String organizationName;
 
+    @Excel(name = "分类", width = 40, needMerge = true)
+    private String categoryName;
+
     @Excel(name = "组织人数", width = 20, needMerge = true)
     private Integer organizationPersonCount;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java

@@ -20,6 +20,10 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo {
     @NotBlank(message = "不能为空")
     private String organizationName;
 
+    @Excel(name = "分类", needMerge = true)
+    @NotBlank(message = "不能为空")
+    private String categoryCode;
+
     @Excel(name = "组织人数", needMerge = true)
     //@NotNull(message = "不能为空")
     private Integer organizationPersonCount;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java

@@ -12,6 +12,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -43,6 +44,7 @@ import com.epmet.entity.IcCommunitySelfOrganizationEntity;
 import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity;
 import com.epmet.excel.CommunitySelfOrgImportExcel;
 import com.epmet.excel.ImportCommunitySelfOrganization;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.OssFeignClient;
 import com.epmet.service.IcCommunitySelfOrganizationPersonnelService;
@@ -51,6 +53,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -93,6 +96,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
     private OssFeignClient ossFeignClient;
     @Autowired
     private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
+    @Autowired
+    private EpmetAdminOpenFeignClient adminOpenFeignClient;
 
     @Override
     public PageData<IcCommunitySelfOrganizationDTO> page(Map<String, Object> params) {
@@ -313,6 +318,11 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
         formDTO.setCustomerId(tokenDto.getCustomerId());
         final int[] i = {(formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE};
         CommunitySelfOrganizationListResultDTO result = new CommunitySelfOrganizationListResultDTO();
+
+        //获取分类名称字典
+        Result<Map<String, String>> dictMapRes=adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
+        Map<String, String> dictMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
+
         if (formDTO.getIsPage()){
             PageInfo<CommunitySelfOrganizationListDTO> objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectCommunitySelfOrganizationList(formDTO));
             result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal())));
@@ -321,6 +331,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     l.setSort(i[NumConstant.ZERO]);
                     i[NumConstant.ZERO]++;
                     l.setScore(null == pointMap.get(l.getOrgId()) ? NumConstant.ZERO : pointMap.get(l.getOrgId()));
+                    //赋值分类名称
+                    l.setCategoryName(dictMap.get(l.getCategoryCode()));
                 }
                 result.setList(objectPageInfo.getList());
             }
@@ -333,6 +345,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
             for (CommunitySelfOrganizationListDTO r : resultDTOs) {
                 r.setSort(sort.getAndSet(sort.get() + NumConstant.ONE));
                 r.setScore(null == pointMap.get(r.getOrgId()) ? NumConstant.ZERO : pointMap.get(r.getOrgId()));
+                //赋值分类名称
+                r.setCategoryName(dictMap.get(r.getCategoryCode()));
             }
             result.setList(resultDTOs);
         }
@@ -538,7 +552,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                         iterator.remove();
                     }
                 }
-
+                Result<Map<String, String>> dictMapRes = adminOpenFeignClient.dictMap(DictTypeEnum.SELF_ORG_CATEGORY.getCode());
+                Map<String, String> categoryMap = dictMapRes.success() && MapUtils.isNotEmpty(dictMapRes.getData()) ? dictMapRes.getData() : new HashMap<>();
                 list.forEach(l -> {
                     IcCommunitySelfOrganizationEntity e = ConvertUtils.sourceToTarget(l, IcCommunitySelfOrganizationEntity.class);
                     e.setCustomerId(tokenDto.getCustomerId());
@@ -547,7 +562,13 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl<IcCo
                     e.setPid(agencyInfo.getPid());
                     e.setPids(agencyInfo.getPids());
                     e.setOrganizationCreatedTime(DateUtils.parse(l.getOrganizationCreatedTime(), DATE_PATTERN));
-
+                    //赋值分类编码，excel输入的是分类名称，需要找到admin字典库中的key
+                    for (String key : categoryMap.keySet()) {
+                        if (StringUtils.isNotBlank(categoryMap.get(key)) && categoryMap.get(key).equals(e.getCategoryCode())) {
+                            e.setCategoryCode(categoryMap.get(key));
+                            break;
+                        }
+                    }
                     List<IcCommunitySelfOrganizationPersonnelEntity> persons = new ArrayList<>();
                     AtomicReference<Boolean> bl = new AtomicReference<>(false);
                     StringBuffer msg = new StringBuffer("");

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml

@@ -46,6 +46,7 @@
     <select id="selectCommunitySelfOrganizationList" resultMap="selectCommunitySelfOrganizationListMap" parameterType="com.epmet.dto.form.CommunitySelfOrganizationListFormDTO">
         SELECT
             so.ORGANIZATION_NAME AS organizationName,
+            so.CATEGORY_CODE AS categoryCode,
             so.ORGANIZATION_PERSON_COUNT AS organizationPersonCount,
             IFNULL(DATE_FORMAT(so.ORGANIZATION_CREATED_TIME,'%Y-%m-%d'),DATE_FORMAT(so.CREATED_TIME,'%Y-%m-%d')) AS organizationCreatedTime,
             so.PRINCIPAL_NAME AS principalName,

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectClosedFromDTO.java

@@ -55,4 +55,14 @@ public class ProjectClosedFromDTO implements Serializable {
 	 * 内部备注对应文件集合
 	 */
 	private List<FileDTO> internalFile;
+
+	/**
+	 * 协办单位ID
+	 */
+	private String assistanceUnitId;
+
+	/**
+	 * 协办单位类型，1社区自组织，2联建单位
+	 */
+	private String assistanceUnitType;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectManageListFormDTO.java

@@ -40,4 +40,8 @@ public class ProjectManageListFormDTO extends PageFormDTO implements Serializabl
     private String status;
 
     private String userId;
+
+    private String customerId;
+
+    private String agencyId;
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java

@@ -55,4 +55,14 @@ public class ProjectResponseFormDTO implements Serializable {
 	 */
 	private List<FileDTO> internalFile;
 
+	/**
+	 * 协办单位ID
+	 */
+	private String assistanceUnitId;
+
+	/**
+	 * 协办单位类型，1社区自组织，2联建单位
+	 */
+	private String assistanceUnitType;
+
 }

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java

@@ -40,5 +40,15 @@ public class TransferFormDTO implements Serializable {
      * 内部备注对应文件集合
      */
     private List<FileDTO> internalFile;
+
+    /**
+     * 协办单位ID
+     */
+    private String assistanceUnitId;
+
+    /**
+     * 协办单位类型，1社区自组织，2联建单位
+     */
+    private String assistanceUnitType;
 }
 

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectManageListResultDTO.java

@@ -1,6 +1,7 @@
 package com.epmet.dto.result;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -65,7 +66,10 @@ public class ProjectManageListResultDTO implements Serializable {
      */
     private List<String> departmentNameList;
 
+    @JsonIgnore
     private Date updatedTime;
+
+    @JsonIgnore
     private String isHandle;
 
     public ProjectManageListResultDTO() {

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -345,9 +345,10 @@ public class ProjectController {
      * @date 2022/5/17 14:19
      */
     @PostMapping("project-list")
-    public Result<PageData> projectList(@LoginUser TokenDto tokenDto,ProjectManageListFormDTO formDTO){
+    public Result<PageData> projectList(@LoginUser TokenDto tokenDto,@RequestBody ProjectManageListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, ProjectManageListFormDTO.ProjectManageListForm.class);
         formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<PageData>().ok(projectService.projectList(formDTO));
     }
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -646,6 +646,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao
         processEntity.setDepartmentId(staffEntity.getDepartmentId());
         processEntity.setGridId(staffEntity.getGridId());
         processEntity.setOrgIdPath(staffEntity.getOrgIdPath());
+        processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
+        processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
         projectProcessDao.insert(processEntity);
         //2-1.项目附件表新增数据
         if ((null != formDTO.getPublicFile() && formDTO.getPublicFile().size() > NumConstant.ZERO)

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -709,6 +709,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectDTO projectDto = ConvertUtils.sourceToTarget(projectEntity, ProjectDTO.class);
 		projectDto.setUpdatedTime(projectDto.getCreatedTime());
 		projectProcessEntity.setCostWorkdays(getDetentionDays(projectDto));
+		projectProcessEntity.setAssistanceUnitType(fromDTO.getAssistanceUnitType());
+		projectProcessEntity.setAssistanceUnitId(fromDTO.getAssistanceUnitId());
 		projectProcessService.insert(projectProcessEntity);
 
 		//保存附件
@@ -2282,6 +2284,8 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		projectProcessEntity.setPublicReply(formDTO.getPublicReply());
 		projectProcessEntity.setInternalRemark(formDTO.getInternalRemark());
 		projectProcessEntity.setStaffId(formDTO.getUserId());
+		projectProcessEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId());
+		projectProcessEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType());
 		projectProcessService.insert(projectProcessEntity);
 
 		//项目附件表新增数据  sun  2020.12.22
@@ -3179,6 +3183,11 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 */
     @Override
     public PageData<ProjectManageListResultDTO> projectList(ProjectManageListFormDTO formDTO) {
+		CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+		if (null == staffInfo){
+			throw new EpmetException("未查询到此工作人员信息"+formDTO.getUserId());
+		}
+		formDTO.setAgencyId(staffInfo.getAgencyId());
 		PageData<ProjectManageListResultDTO> result = new PageData<>(new ArrayList<>(),NumConstant.ZERO);
 		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
 		formDTO.setPageNo(pageIndex);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -575,7 +575,8 @@
             p.CREATED_TIME AS shiftProjectTime,
             ps.IS_HANDLE,
             ps.CREATED_TIME AS updatedTime,
-            t.* FROM
+            t.*
+        FROM
             (SELECT
                   DISTINCT pp.PROJECT_ID,
                   pp.INTERNAL_REMARK,
@@ -583,10 +584,25 @@
              FROM project_process pp
              WHERE DEL_FLAG = '0'
                AND pp.STAFF_ID = #{userId}
+               AND pp.ORG_ID_PATH LIKE CONCAT('%',#{agencyId})
              ORDER BY pp.CREATED_TIME DESC) t
             INNER JOIN project p ON p.ID = t.PROJECT_ID AND p.DEL_FLAG = '0'
             LEFT JOIN project_staff ps ON ps.PROJECT_ID = t.PROJECT_ID AND ps.DEL_FLAG = '0'
+        WHERE 1=1
+            <if test='null != title and title != "" '>
+                AND p.TITLE LIKE CONCAT('',#{title},'')
+            </if>
+            <if test='null != startDate and startDate != "" '>
+                AND DATE_FORMAT(p.CREATED_TIME,'%Y%m%d') >= #{startDate}
+            </if>
+            <if test='null != endDate and endDate != "" '>
+                AND DATE_FORMAT(p.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
+            </if>
+            <if test='null != status and status != "all" '>
+                AND p.`STATUS` = #{status}
+            </if>
         GROUP BY t.PROJECT_ID
+        ORDER BY p.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>