Merge remote-tracking branch 'origin/master'

3 years ago · 59512323be
9 changed files with 102 additions and 17 deletions
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoAuditController.java
@ -43,13 +43,13 @@ import java.util.Map;
@RestController
@RequestMapping("epidemicuserinfoaudit")
 public class EpidemicUserInfoAuditController {
-    
+
    @Autowired
    private EpidemicUserInfoAuditService epidemicUserInfoAuditService;

    @GetMapping("page")
    public Result<PageData<EpidemicUserInfoAuditDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<EpidemicUserInfoAuditDTO> page = epidemicUserInfoAuditService.page(params);
+        PageData<EpidemicUserInfoAuditDTO> page = epidemicUserInfoAuditService.getPageList(params);
        return new Result<PageData<EpidemicUserInfoAuditDTO>>().ok(page);
    }

@ -91,4 +91,4 @@ public class EpidemicUserInfoAuditController {
        return new Result();
    }

-}
+}
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoAuditDao.java
@ -25,6 +25,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
+import java.util.Map;

 /**
 * 疫情防控信息表
@ -55,4 +56,6 @@ public interface EpidemicUserInfoAuditDao extends BaseDao<EpidemicUserInfoAuditE
     * @date 2022/6/30 14:12
     */
    List<FamilyMemberInfoResultDTO> listByUnitId(@Param("unitId") Long unitId, @Param("existIdCard") List<String> existIdCard);
-}
+
+    List<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params);
+}
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoAuditService.java
@ -126,4 +126,6 @@ public interface EpidemicUserInfoAuditService extends BaseService<EpidemicUserIn
     * @date 2022-06-29
     */
    void delete(String[] ids);
-}
+
+    PageData<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params);
+}
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoAuditServiceImpl.java
@ -22,7 +22,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 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.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO;
 import com.elink.esua.epdc.dto.epidemic.result.EpidemicUserInfoAuditResultDTO;
@ -163,4 +167,19 @@ public class EpidemicUserInfoAuditServiceImpl extends BaseServiceImpl<EpidemicUs
        baseDao.deleteBatchIds(Arrays.asList(ids));
    }

-}
+    @Override
+    public PageData<EpidemicUserInfoAuditDTO> getPageList(Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        if (user == null) {
+            throw new RenException("用户未登录");
+        }
+        // 街道和超管有权查看所有数据
+        if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) {
+            params.put("deptIdList", user.getDeptIdList());
+        }
+        IPage<EpidemicUserInfoAuditDTO> page = getPage(params);
+        List<EpidemicUserInfoAuditDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+}
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoExportServer.java
@ -41,13 +41,14 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer {
        String grids = (String) params.get("deptIdList");
        String agencyList = (String) params.get("agencyList");

-        if(StringUtils.isNotBlank(grids)){
+        if (StringUtils.isNotBlank(grids)) {
            List<String> gridList = Arrays.asList(grids.split(","));
-            params.put("gridList",gridList);
+            params.put("gridList", gridList);
        }
-        if(StringUtils.isNotBlank(agencyList)){
+        params.put("deptIdList", null);
+        if (StringUtils.isNotBlank(agencyList)) {
            List<String> agencyIdList = Arrays.asList(agencyList.split(","));
-            params.put("agencyIdList",agencyIdList);
+            params.put("agencyIdList", agencyIdList);
        }
        UserDetail user = SecurityUser.getUser();
        if (user == null) {
@ -59,8 +60,8 @@ public class EpidemicUserInfoExportServer implements IExcelExportServer {
        }
        List<EpidemicRecordListDTO> recordList = epidemicUserInfoDao.getEpidemicUserRecordList(params);

-        params.put("deptIdList",null);
-        params.put("agencyList",null);
+        params.put("deptIdList", null);
+        params.put("agencyList", null);

        List<Object> targetList = new ArrayList<>();
        if (CollUtil.isNotEmpty(recordList)) {
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java
@ -49,6 +49,7 @@ 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 +123,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
    @Autowired
    private EpidemicUserInfoAuditService epidemicUserInfoAuditService;

+    @Autowired
+    private VimAdminFeignClient adminFeignClient;
+
    @Override
    public QueryWrapper<EpidemicUserInfoEntity> getWrapper(Map<String, Object> params) {
        String id = (String) params.get("id");
@ -1660,12 +1664,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 +1685,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 +1718,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);
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@ -57,7 +57,6 @@ import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExce
 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.EpidemicPlotBuildingEntity;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
 import com.elink.esua.epdc.vaccine.personroom.redis.EpidemicBuildingUnitRedis;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoAuditDao.xml
@ -75,4 +75,36 @@
            </foreach>
        </if>
    </select>
-</mapper>
+    <select id="getPageList" resultType="com.elink.esua.epdc.dto.EpidemicUserInfoAuditDTO">
+        select * from epidemic_user_info_audit
+        WHERE
+            DEL_FLAG = '0'
+            <if test="userName != '' and userName != null">
+                AND USER_NAME like '%${userName}%'
+            </if>
+            <if test="idCard != '' and idCard != null">
+                AND ID_CARD like '%${idCard}%'
+            </if>
+            <if test="auditState != '' and auditState != null">
+                AND AUDIT_STATE = #{auditState}
+            </if>
+            <if test="streetId != '' and streetId != null">
+                AND (find_in_set(#{streetId},PARENT_DEPT_IDS)
+                OR find_in_set(#{streetId},ALL_DEPT_IDS))
+            </if>
+            <if test="communityId != '' and communityId != null">
+                AND (find_in_set(#{communityId},PARENT_DEPT_IDS)
+                OR find_in_set(#{communityId},ALL_DEPT_IDS))
+            </if>
+            <if test="gridId != '' and gridId != null">
+                and find_in_set(#{gridId},ALL_DEPT_IDS)
+            </if>
+            <if test="deptIdList != null and deptIdList.size() > 0">
+                and dept_id in
+                <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        order by CREATED_TIME desc
+    </select>
+</mapper>
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicUnitOwnerDao.xml
@ -113,10 +113,11 @@
        select
        un.ROOM_CODE
        from epidemic_unit_owner ow
-        left join epidemic_building_unit un on ow.UNIT_ID = un.ID and un.DEL_FLAG = '0'
+        left join epidemic_building_unit un on ow.UNIT_ID = un.ID
        where ow.DEL_FLAG = '0'
+        and un.DEL_FLAG = '0'
        and ow.ID_CARD = #{idCard}
-        order by ow.CREATED_TIME
+        order by ow.CREATED_TIME DESC
        limit 1

    </select>