Browse Source

【网格实体化运作】-【列表数据全线修改】-(王童)-2020/12/10

feature/dangjian
Jackwang 5 years ago
parent
commit
cd53b74a29
  1. 16
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
  2. 13
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml

16
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java

@ -28,11 +28,9 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.SubPositionCheckInfoDao;
import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
import com.elink.esua.epdc.entity.SubInfoGridRelationEntity;
import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity;
import com.elink.esua.epdc.feign.AdminFeignClient;
import com.elink.esua.epdc.redis.SubPositionCheckInfoRedis;
import com.elink.esua.epdc.service.KpiGridEntityService;
import com.elink.esua.epdc.service.SubAuditRecordsLogService;
@ -69,25 +67,13 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
@Autowired
private SubInfoGridRelationService subInfoGridRelationService;
@Autowired
private AdminFeignClient adminFeignClient;
@Autowired
private KpiGridEntityService kpiGridEntityService;
@Override
public PageData<SubPositionCheckInfoDTO> page(Map<String, Object> params) {
String userId = SecurityUser.getUser().getId().toString();
log.info("用户信息:"+SecurityUser.getUser().getTypeKey());
Long deptId = SecurityUser.getUser().getDeptId();
// 查询机构类型键值
Result<SysDeptDTO> result = adminFeignClient.get(deptId);
SysDeptDTO sysDeptDTO = result.getData();
if(sysDeptDTO == null){
throw new RenException("未查到机构类型信息!");
}
params.put("typeKey",sysDeptDTO.getTypeKey());
params.put("sysDeptId",deptId);
params.put("deptIdList",SecurityUser.getUser().getDeptIdList());
IPage<SubPositionCheckInfoDTO> page = getPage(params);
List<SubPositionCheckInfoDTO> list = baseDao.getSubPositionList(params);

13
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml

@ -48,14 +48,11 @@
<if test="deptId != null and deptId != ''">
and find_in_set(#{deptId},ALL_DEPT_IDS)
</if>
<if test="typeKey == 'grid_party' || typeKey == 'community_party'">
and DEPT_ID=#{sysDeptId}
</if>
<if test="typeKey == 'street_party'">
and find_in_set(#{sysDeptId},ALL_DEPT_IDS)
</if>
<if test="typeKey == 'district_party' || typeKey == 'district_dept'">
and STATUS = 2
<if test="deptIdList != null and deptIdList.size()>0">
AND DEPT_ID IN
<foreach collection="deptIdList" open="(" separator="," close=")" item="deptId">
#{deptId}
</foreach>
</if>
order by CREATED_TIME desc
</select>

Loading…
Cancel
Save