临时提交

3 years ago · 6316104826
3 changed files with 59 additions and 47 deletions
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
@ -108,6 +108,16 @@ public interface ItemService extends BaseService<ItemEntity> {
     */
    ItemDTO get(String id);

+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ItemDTO
+     * @author
+     * @date
+     */
+    ItemDTO getCategoryInfo(String id);
+
    /**
     * 项目详情
     *
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@ -434,6 +434,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
        return ConvertUtils.sourceToTarget(entity, ItemDTO.class);
    }

+    @Override
+    public ItemDTO getCategoryInfo(String id) {
+        ItemEntity entity = baseDao.getCategoryInfo(id);
+        return ConvertUtils.sourceToTarget(entity, ItemDTO.class);
+    }
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void save(ItemDTO dto) {
@ -936,10 +942,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
        List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
        resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);

+        // todo
+
        // 根据操作人部门，获取上一级部门ID
        Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());
        if (sysDeptInfo.success()) {
            SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
+
            if (sysDeptDTO != null && "community_party".equals(sysDeptDTO.getTypeKey())) {
                ArrayList<String> list = new ArrayList<>();
                list.add("历史遗留暂不具备解决条件的事项");
@ -3234,7 +3243,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
        data.setId(entity.getId());
        data.setSqbm(entity.getSerialNum());
        data.setJjcd(CityPushEnum.JJCD_YB.getCode());
-        data.setSqly(CityPushEnum.SQLY_WX.getCode());
+        data.setSqly(CityPushEnum.SQLY_WLFS.getCode());
        data.setSqzt(CityPushEnum.SQZT_DPQ.getCode());
        data.setDqclhj(CityPushEnum.DQCLHJ_DJ.getCode());
        data.setSbqs(CityPushEnum.SBQS_SB.getCode());
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@ -20,7 +20,6 @@ package com.elink.esua.epdc.modules.item.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
 import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum;
@ -35,6 +34,7 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
+import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
@ -212,12 +212,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     */
    @Override
    public Result caseClosedSentoCity(String id) {
-        String isPartyMember = id; // ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue();
-        ItemHandleProcessCaseClosedToCityDTO item = itemHandleProcessDao.getHandler(isPartyMember);
+        ItemHandleProcessCaseClosedToCityDTO item = itemHandleProcessDao.getHandler(id);

        // 组装数据
-//        for (ItemHandleProcessCaseClosedToCityDTO item: itemProcessDto) {
-
        PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO();

        // 诉求id
@ -242,7 +239,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        // 所属机构
        czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR));
        //所属部门id
-        czr.setSsbmbm(item.getGridUnitid());;
+        czr.setSsbmbm(item.getGridUnitid());
+        ;
        // 所属部门名称
        czr.setSsbm(item.getGridUnitname());

@ -250,12 +248,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        data.setCzr(czr);
        String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.CASE_CLOSED, "诉求结案");
        saveLog(item.getItemId(), item.getId(), "诉求结案", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(data), result);
-//        }
        return new Result();
    }


-
    @Override
    public void appealSupervise(ItemHandleProcessDTO processDTO) {
        if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
@ -331,8 +327,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     */
    @Override
    public Result dispatchAudit(ItemHandleProcessDTO formDTO) {
-        /*String state = "1001";
-        List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getDispatchAudit(state);*/
+        /*String state = "1001";*/

        List<ItemHandleProcessDTO> list = new ArrayList<>();
        if (null != formDTO && StringUtils.isNotBlank(formDTO.getItemId())) {
@ -447,8 +442,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        }

        // 处理数据
-//        for(ItemHandleProcessToCityResultDTO item : list) {
-
        AppealReportResultDTO data = new AppealReportResultDTO();

        // 诉求id
@ -515,7 +508,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_REPORT, "诉求上报");

        saveLog(item.getItemId(), item.getId(), "诉求上报", PushToCityGridConstant.APPEAL_REPORT, JSONObject.toJSONString(data), result);
-//        }
        return new Result();
    }

@ -537,8 +529,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        }

        // 处理数据
-//        for(ItemHandleProcessToCityResultDTO item : list) {
-
        ReportRejectionResultDTO data = new ReportRejectionResultDTO();

        // 诉求id
@ -565,7 +555,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        // 所属机构名称
        dto.setSsjg(item.getGridUnitname());
        // 所属部门id
-        dto.setSsbmbm(item.getGridUnitid());;
+        dto.setSsbmbm(item.getGridUnitid());
+        ;
        // 所属部门名称
        dto.setSsbm(item.getGridUnitname());

@ -574,7 +565,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.REPORT_REBUT, "上报驳回");

        saveLog(item.getItemId(), item.getId(), "上报驳回", PushToCityGridConstant.REPORT_REBUT, JSONObject.toJSONString(data), result);
-//        }
        return new Result();
    }

@ -589,9 +579,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
    @Override
    public Result appealHandling(ItemHandleProcessDTO processDTO) {
        String id = processDTO.getId();
+        String itemId = processDTO.getItemId();
        AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());
-
-        if (null == item) {
+        ItemDTO itemDTO = itemService.get(itemId);
+        if (null == item || itemDTO == null) {
            log.error("流程节点不存在");
            return new Result();
        }
@ -607,8 +598,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
        data.setCzbs(getItemCzbs(item.getGridCantoncode()));
        // 执法类型添加类型，纪要，进度字段
        if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
-            // 诉求类型（未知）
-            data.setSqlx(NumConstant.TWO_STR);
            //办理进度 诉求分类是执法的时候
            //获取taskID
            LambdaQueryWrapper<ItemGridPlatformEntity> wrapper = new LambdaQueryWrapper<>();
@ -655,6 +644,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
            //办理进度
            data.setClfj(clfjList);
        }
+        // 处理类型
+        data.setSqlx("itemDTO.getcate");
        // 处理时间
        data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
        // 处理内容
@ -1229,6 +1220,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {

    /**
     * 获取机构编码
+     *
     * @Param type 0返回编码，1返回名字
     * @Param deptId
     * @Return {@link String}
@ -1254,6 +1246,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {

    /**
     * 获取项目节点数据操作人对应的处置标识
+     *
     * @param code
     * @return
     */