elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

临时提交

feature/dangjian
zhangyuan 3 years ago
parent
8286dd1601
commit
6316104826
3 changed files with 59 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  2. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 85
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
View File

@ -108,6 +108,16 @@ public interface ItemService extends BaseService<ItemEntity> {
*/
ItemDTO get(String id);
/**
* 单条查询
*
* @param id
* @return ItemDTO
* @author
* @date
*/
ItemDTO getCategoryInfo(String id);
/**
* 项目详情
*

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

@ -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());

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

@ -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;
@ -112,9 +112,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setSqid(getSqid(item.getItemId()));
data.setSqzt(CityPushStateEnum.DPQ.getCode());
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
data.setCznr(item.getHandleAdvice());
data.setClqx(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));//处理期限
data.setClqx(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));//处理期限
// 组装派遣人
AppealDispatchResultDto.CzrDTO czrDTO = new AppealDispatchResultDto.CzrDTO();
@ -185,7 +185,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setCznr(item.getHandleAdvice());
AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
czr.setId(item.getGridPartyid());
@ -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())) {
@ -282,7 +278,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId()));
dto.setDbr(item.getGridPartyname());
dto.setDbsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setDbsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setDbnr(item.getHandleAdvice());
// 组装好直接推送
String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办");
@ -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())) {
@ -355,7 +350,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 当前处理环节(未知)
data.setDqclhj(CityPushLinkEnum.KSLDSH.getCode());
// 审核时间
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
// 审核结果 1：审核通过 0：审核不通过
data.setShjg(NumConstant.ONE_STR);
// 审核意见
@ -447,22 +442,20 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
// 处理数据
// for(ItemHandleProcessToCityResultDTO item : list) {
AppealReportResultDTO data = new AppealReportResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 上报时间
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
// 上报原因
data.setCznr(item.getHandleAdvice());
// 操作人
AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO();
if(source.equals(NumConstant.ZERO_STR)) { // 0是自己平台
if (source.equals(NumConstant.ZERO_STR)) { // 0是自己平台
// 诉求状态
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节
@ -483,13 +476,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
if (dtoResult.success() && null != dtoResult.getData()) {
SysDeptDTO sysDeptDTO = dtoResult.getData();
// 社区直接获取机构id
if(sysDeptDTO.getTypeKey().equals("community_party")) {
if (sysDeptDTO.getTypeKey().equals("community_party")) {
// 所属机构id
dto.setSsjgbm(sysDeptDTO.getDisCenterZoningCode());
// 所属机构名称
dto.setSsjg(sysDeptDTO.getName());
// 网格调接口获取机构id
}else if(sysDeptDTO.getTypeKey().equals("grid_party")) {
} else if (sysDeptDTO.getTypeKey().equals("grid_party")) {
Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(item.getHandlerDeptId());
CompleteDeptDTO completeDeptDTO = completeDept.getData();
dto.setSsjgbm(completeDeptDTO.getCommunityDisCenterZoningCode());
@ -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
@ -550,7 +540,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//处置标识
data.setCzbs(getItemCzbs(item.getGridCantoncode()));
// 驳回时间
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
// 驳回原因
data.setCznr(item.getHandleAdvice());
@ -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();
}
@ -606,9 +597,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//处置标识
data.setCzbs(getItemCzbs(item.getGridCantoncode()));
// 执法类型添加类型，纪要，进度字段
if(item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
// 诉求类型（未知）
data.setSqlx(NumConstant.TWO_STR);
if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
//办理进度 诉求分类是执法的时候
//获取taskID
LambdaQueryWrapper<ItemGridPlatformEntity> wrapper = new LambdaQueryWrapper<>();
@ -655,8 +644,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//办理进度
data.setClfj(clfjList);
}
// 处理类型
data.setSqlx("itemDTO.getcate");
// 处理时间
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
// 处理内容
data.setCznr(item.getHandleAdvice());
// 处理照片
@ -669,7 +660,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 操作人
AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(null == SecurityUser.getUser()?"":SecurityUser.getUser().getUsername());
dto.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername());
// 操作人员唯一标识
dto.setId(item.getCreatedBy());
// 所属机构id
@ -684,7 +675,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setCzr(dto);
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.HANDLE, "诉求处理");
saveLog(item.getItemId(),item.getId(),"诉求处理",PushToCityGridConstant.HANDLE,JSONObject.toJSONString(data),result);
saveLog(item.getItemId(), item.getId(), "诉求处理", PushToCityGridConstant.HANDLE, JSONObject.toJSONString(data), result);
return new Result();
}
@ -748,7 +739,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.DCL.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setCznr(item.getHandleAdvice());
dto.setCzbs(getItemCzbs(item.getGridCantoncode()));
RebutResultDTO.CzrDTO czr = new RebutResultDTO.CzrDTO();
@ -791,7 +782,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.DSH.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setShjg("0");
dto.setCznr(item.getHandleAdvice());
dto.setCzbs(getItemCzbs(item.getGridCantoncode()));
@ -842,7 +833,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
hour = 3600 * 1000 * Integer.parseInt(item.getGridDelayhour());
}
dto.setYqsx(DateUtils.format(new Date(item.getCreatedTime().getTime() + hour), DateUtils.DATE_TIME_PATTERN));
dto.setSqsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setSqsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setSqnr(item.getHandleAdvice());
DelayApplyResultDTO.SqrDTO sqr = new DelayApplyResultDTO.SqrDTO();
sqr.setId(item.getGridPartyid());
@ -884,14 +875,14 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.DSH.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
dto.setCzjg(StringUtils.isNotBlank(item.getGridDelayresult())?item.getGridDelayresult():"0");
dto.setCzjg(StringUtils.isNotBlank(item.getGridDelayresult()) ? item.getGridDelayresult() : "0");
//延期时间(创建时间加小时数) 审核通过的才能加延期时限
long hour = 0;
if (StringUtils.isNotBlank(item.getGridDelayresult()) && "1".equals(item.getGridDelayresult()) && StringUtils.isNotBlank(item.getGridDelayhour())) {
hour = 3600 * 1000 * Integer.parseInt(item.getGridDelayhour());
}
dto.setYqsj(DateUtils.format(new Date(item.getCreatedTime().getTime() + hour), DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setCzyj(item.getHandleAdvice());
DelayAuditResultDTO.CzrDTO czr = new DelayAuditResultDTO.CzrDTO();
czr.setId(item.getGridPartyid());
@ -934,7 +925,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.DCL.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setShjg("1");//审核通过
dto.setCznr(item.getHandleAdvice());
dto.setCzbs(getItemCzbs(item.getGridCantoncode()));
@ -997,7 +988,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
break;
}
//评价时间
dto.setCzsj(DateUtils.format(item.getEvaluationTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getEvaluationTime(), DateUtils.DATE_TIME_PATTERN));
//评价意见
dto.setCzyj(item.getEvaluationContent());
//评价人员
@ -1052,7 +1043,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//申请内容
dto.setSqnr(item.getHandleAdvice());
//申请时间
dto.setSqsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setSqsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
//申请人员
EarlyInspectionApplyResultDTO.SqrBean sqr = new EarlyInspectionApplyResultDTO.SqrBean();
sqr.setId(item.getGridPartyid());
@ -1106,7 +1097,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setCzjg(NumConstant.ZERO_STR);
}
//初验时间
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
//初验意见
dto.setCzyj(item.getHandleAdvice());
//初验人员
@ -1165,7 +1156,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setCzjg(NumConstant.ZERO_STR);
}
//终验时间
dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
//终验意见
dto.setCzyj(item.getHandleAdvice());
//终验人员
@ -1196,7 +1187,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setDqclhj(CityPushLinkEnum.KSLDSH.getCode());
dto.setCzbs(getItemCzbs(entity.getGridCantoncode()));
dto.setCzjg(NumConstant.ONE_STR);
dto.setCzsj(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzsj(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setCzyj(entity.getHandleAdvice());
AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO();
czr.setId(entity.getGridPartyid());
@ -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
*/

Write Preview
Loading…
Cancel
Save