添加、修改家庭成员补充部门信息

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -45,10 +45,12 @@ import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoAuditEntity;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInoutRecordEntity;
 import com.elink.esua.epdc.vaccine.epidemic.service.*;
+import com.elink.esua.epdc.vaccine.feign.AdminFeignClient;
 import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient;
 import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel;
 import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicBuildingUnitDao;
 import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao;
+import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService;
@@ -122,6 +124,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Autowired
     private EpidemicUserInfoAuditService epidemicUserInfoAuditService;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public QueryWrapper<EpidemicUserInfoEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get("id");
@@ -1660,12 +1665,13 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return new Result<FamilyMemberInfoResultDTO>().ok(dto);
     }
 
+    @Transactional
     @Override
     public Result addFamilyMember(FamilyMemberInfoFormDTO formDTO) {
-        // 获取房屋网格ID
         if (formDTO.getUnitId() == null) {
             return new Result().error("unitId不能为空");
         }
+        // 获取房屋网格ID
         EpidemicBuildingUnitDetailResultDTO entity = epidemicBuildingUnitDao.selectDetailById(formDTO.getUnitId().toString());
         String gridId = entity.getGridId();
         // 查询父部门信息
@@ -1680,6 +1686,8 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         // 需要审核
         if (YesOrNoEnum.YES.value().equals(formDTO.getNeedAudit())) {
             EpidemicUserInfoAuditEntity epidemicUserInfoAuditEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoAuditEntity.class);
+            //组装部门信息
+            setApplyDeptInfo(epidemicUserInfoAuditEntity,formDTO.getUnitId());
             epidemicUserInfoAuditEntity.setAuditType(NumConstant.ZERO_STR);
             epidemicUserInfoAuditEntity.setAuditState(NumConstant.ZERO_STR);
             epidemicUserInfoAuditService.insert(epidemicUserInfoAuditEntity);
@@ -1711,11 +1719,32 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return new Result();
     }
 
+    @Transactional
+    public void setApplyDeptInfo(EpidemicUserInfoAuditEntity epidemicUserInfoAuditEntity, Long unitId) {
+        EpidemicBuildingUnitEntity unit = epidemicBuildingUnitDao.selectById(unitId);
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(unit.getGridId());
+        if (!parentAndAllDeptDTOResult.success()) {
+            throw new RenException("获取部门信息失败");
+        }
+
+        epidemicUserInfoAuditEntity.setDeptId(parentAndAllDeptDTOResult.getData().getGridId());
+        epidemicUserInfoAuditEntity.setDeptName(parentAndAllDeptDTOResult.getData().getGrid());
+        epidemicUserInfoAuditEntity.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
+        epidemicUserInfoAuditEntity.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+        epidemicUserInfoAuditEntity.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+        epidemicUserInfoAuditEntity.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+    }
+
     @Override
     public Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO) {
+        if (formDTO.getUnitId() == null) {
+            return new Result().error("unitId不能为空");
+        }
         // 需要审核
         if (YesOrNoEnum.YES.value().equals(formDTO.getNeedAudit())) {
             EpidemicUserInfoAuditEntity epidemicUserInfoAuditEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoAuditEntity.class);
+            //组装部门信息
+            setApplyDeptInfo(epidemicUserInfoAuditEntity,formDTO.getUnitId());
             epidemicUserInfoAuditEntity.setAuditType(NumConstant.ONE_STR);
             epidemicUserInfoAuditEntity.setAuditState(NumConstant.ZERO_STR);
             epidemicUserInfoAuditService.insert(epidemicUserInfoAuditEntity);

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/AdminFeignClient.java

@@ -0,0 +1,58 @@
+package com.elink.esua.epdc.vaccine.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
+import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
+import com.elink.esua.epdc.vaccine.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 14:44
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+
+    /**
+     * 根据部门ID，获取下属所有网格ID
+     *
+     * @param pid
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
+     * @author yujintao
+     * @date 2019/9/5 14:49
+     */
+    @GetMapping("/sys/dept/listGridId/{pid}")
+    Result<List<Long>> listGridIdByDeptPid(@PathVariable("pid") Long pid);
+
+    /**
+     * 根据部门ID获取上级所有部门信息
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @author gp
+     * @date 2019-11-29
+     */
+    @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.SysPopulationSimpleDictDTO>>
+     * @Description 获取多个字典值列表
+     * @Author songyunpeng
+     * @Date 2020/8/31
+     * @Param [sysPopulationSimpleDictFormDTO]
+     **/
+    @PostMapping("sys/dict/listPopulationSimple")
+    Result<List<SysPopulationSimpleDictDTO>> listPopulationSimple(@RequestBody SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO);
+
+
+}

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/feign/fallback/AdminFeignClientFallback.java

@@ -0,0 +1,38 @@
+package com.elink.esua.epdc.vaccine.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
+import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
+import com.elink.esua.epdc.vaccine.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 14:44
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+    @Override
+    public Result<List<Long>> listGridIdByDeptPid(Long pid) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listGridIdByDeptPid", pid);
+    }
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
+    }
+
+    @Override
+    public Result<List<SysPopulationSimpleDictDTO>> listPopulationSimple(SysPopulationSimpleDictFormDTO sysPopulationSimpleDictFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listPopulationSimple", sysPopulationSimpleDictFormDTO);
+    }
+
+
+}