结案申请的时候不在上报市平台，只有吹哨的时候

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -346,7 +346,7 @@ public class SysDeptController {
     }
 
     /**
-     * @param [deptId]
+     * @param deptId
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 获得部门类型
      * @author wangtong
@@ -513,4 +513,12 @@ public class SysDeptController {
         return new Result<SysDeptDTO>().ok(sysDeptService.getDept(formDTO));
     }
 
+    @GetMapping("option/list")
+    @ApiOperation("下拉列表")
+    public Result<List<SysDeptDTO>> listOption(@RequestParam Map<String, Object> params) {
+        List<SysDeptDTO> list = sysDeptService.listDefault(params);
+
+        return new Result<List<SysDeptDTO>>().ok(list);
+    }
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -34,6 +34,16 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
 
     List<SysDeptDTO> list(Map<String, Object> params);
 
+    /**
+     * 默认列表，无数据权限
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @author zhy
+     * @date 2022/10/11 14:46
+     */
+    List<SysDeptDTO> listDefault(Map<String, Object> params);
+
     SysDeptDTO get(Long id);
 
     void save(SysDeptDTO dto);

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -129,6 +129,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return TreeUtils.build(dtoList);
     }
 
+    @Override
+    public List<SysDeptDTO> listDefault(Map<String, Object> params) {
+        List<SysDeptEntity> entityList = baseDao.getList(params);
+
+        List<SysDeptDTO> dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
+
+        return TreeUtils.build(dtoList);
+    }
+
     @Override
     public List<SysSimpleDeptDTO> subList(String pid) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -12,6 +12,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test="pid != null and pid != ''">
+            AND t1.pid = #{pid}
+        </if>
+        <if test="eventContent != null and eventContent != ''">
+            AND t1.type_key = #{typeKey}
+        </if>
         order by t1.sort asc
     </select>
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java

@@ -6,8 +6,6 @@ import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.management.relation.RelationSupport;
-
 @RestController
 @RequestMapping("PushToCity")
 public class PushToCityGridController {
@@ -52,7 +50,7 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealReporting")
     public Result AppealReporting(String processId, String source){
-        return pushToCityGridService.AppealReporting(processId, source);
+        return pushToCityGridService.appealReporting(processId, source);
     }
 
     /**
@@ -65,7 +63,7 @@ public class PushToCityGridController {
      */
     @PostMapping("ReportRejection")
     public Result ReportRejection(ItemHandleProcessDTO dto){
-        return pushToCityGridService.ReportRejection(dto.getItemId());
+        return pushToCityGridService.reportRejection(dto.getItemId());
     }
 
     /**
@@ -78,6 +76,6 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealHandling")
     public Result AppealHandling(@RequestBody ItemHandleProcessDTO dto){
-        return pushToCityGridService.AppealHandling(dto);
+        return pushToCityGridService.appealHandling(dto);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java

@@ -107,7 +107,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:22
      */
-    Result AppealReporting(String processId,String source);
+    Result appealReporting(String processId, String source);
 
     /**
      * 事件感知
@@ -127,7 +127,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:43
      */
-    Result ReportRejection(String id);
+    Result reportRejection(String id);
 
     /**
      * 诉求处理
@@ -137,7 +137,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 11:01
      */
-    Result AppealHandling(ItemHandleProcessDTO dto);
+    Result appealHandling(ItemHandleProcessDTO dto);
 
     /**
      * 2.8 诉求退件

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -1389,7 +1389,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 // 发送菜单消息-待处理项目-吹哨部门
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
                 // 网格吹哨,上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 log.info("网格吹哨，上报市平台-结束");
                 // 上报网格化平台（社区吹哨）
             } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) {
@@ -1401,7 +1401,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 log.info("处理项目-上报网格化平台-if结束");
 
                 //社区吹哨，上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 log.info("社区吹哨-上报市平台-结束");
                 // 结案申请
             } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
@@ -1462,11 +1462,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 longTreeSet.addAll(newDeptIds);
                 List<Long> deptIds = new ArrayList<>(longTreeSet);
 
-                // 网格结案，社区结案，上报市平台
+                // 网格结案申请，社区结案申请，上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+//                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 // 发送菜单消息-待处理项目-吹哨部门
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
-                pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
+                pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
                 log.info("处理项目-结案申请-if结束");
             } else {
                 handleProcessEntity.setState(dto.getHandleCategory());
@@ -2837,7 +2837,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() ||
                 ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() ||
                 ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) {
-            pushToCityGridService.AppealReporting(dto.getId(), NumConstant.ONE_STR);
+            pushToCityGridService.appealReporting(dto.getId(), NumConstant.ONE_STR);
         }
     }
 
@@ -3580,12 +3580,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             throw new RenException("审批标识有误");
         }
         itemHandleProcessDao.insert(process);
-        //同意的时候，上报诉求处理
+//        // 结案申请，同意的时候，上报诉求处理
-        if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
+//        if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
-            // 社区审批，上报市平台
+//            // 社区审批，上报市平台
-            pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR);
+////            pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR);
-            //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
+//            //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
-        }
+//        }
 
         if ("0".equals(formDto.getCheckFlag())) {
             //发送结案申请至街道网格化平台
@@ -3778,7 +3778,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if ("1".equals(formDto.getState())) {
                 // 上报驳回，上报市平台
                 log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId());
-                pushToCityGridService.ReportRejection(itemHandleProcessDto.getId());
+                pushToCityGridService.reportRejection(itemHandleProcessDto.getId());
             } else if ("0".equals(formDto.getState())) {
                 // 诉求审核，上报市平台
                 pushToCityGridService.appealAudit(itemHandleProcessDto.getId());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -439,7 +439,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:22
      */
     @Override
-    public Result AppealReporting(String processId, String source) {
+    public Result appealReporting(String processId, String source) {
         ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(processId);
         if (null == item) {
             log.error("流程节点不存在");
@@ -528,7 +528,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:44
      */
     @Override
-    public Result ReportRejection(String id) {
+    public Result reportRejection(String id) {
         String ids = id;   // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
         ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(ids);
         if (null == item) {
@@ -587,7 +587,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 11:02
      */
     @Override
-    public Result AppealHandling(ItemHandleProcessDTO processDTO) {
+    public Result appealHandling(ItemHandleProcessDTO processDTO) {
         String id = processDTO.getId();
         AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());