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
91ca5f6d10
commit
eadcbebd43
3 changed files with 214 additions and 185 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. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
  2. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  3. 392
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

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

@ -43,12 +43,12 @@ public interface PushToCityGridService {
/**
* 诉求废弃
*
* @param
* @param dto
* @return void
* @author zhy
* @date 2022/9/16 15:17
*/
void appealScrap();
void appealScrap(ItemHandleProcessDTO dto);
/**
* 诉求督办

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

@ -2429,6 +2429,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
pushToCityGridService.earlyInspection(dto);
//诉求终验
pushToCityGridService.endInspection(dto);
} else if(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue() == dto.getState()){
//诉求初验
pushToCityGridService.appealScrap(dto);
}
// 网格化平台，处置完成、延期申请、申请办结、向上申请
if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState() ||

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

@ -133,32 +133,56 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
@Override
public void appealScrap() {
// 昨天
String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
// state=作废的流程数据
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue()), date);
// 拼接数据
list.forEach(item -> {
AppealScrapResultDTO dto = new AppealScrapResultDTO();
public void appealScrap(ItemHandleProcessDTO processDTO) {
if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId());
String sqId = getSqid(item.getItemId());
if (StringUtils.isNotBlank(sqId)) {
AppealScrapResultDTO dto = new AppealScrapResultDTO();
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(item.getCreatedTime().toString());
dto.setCznr(item.getHandleAdvice());
AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
czr.setId(item.getGridPartyid());
czr.setXm(item.getGridPartyname());
czr.setSsjgbm(item.getGridUnitid());
czr.setSsjg(item.getGridUnitname());
czr.setSsbmbm(item.getGridUnitid());
czr.setSsbm(item.getGridUnitname());
dto.setCzr(czr);
// 组装好直接推送
cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求废弃");
});
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(item.getCreatedTime().toString());
dto.setCznr(item.getHandleAdvice());
AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
czr.setId(item.getGridPartyid());
czr.setXm(item.getGridPartyname());
czr.setSsjgbm(item.getGridUnitid());
czr.setSsjg(item.getGridUnitname());
czr.setSsbmbm(item.getGridUnitid());
czr.setSsbm(item.getGridUnitname());
dto.setCzr(czr);
// 组装好直接推送
String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求废弃");
saveLog(item.getItemId(), item.getId(), "诉求结案", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(dto), result);
}
} else {
// 昨天
String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
// state=作废的流程数据
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue()), date);
// 拼接数据
list.forEach(item -> {
AppealScrapResultDTO dto = new AppealScrapResultDTO();
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(item.getCreatedTime().toString());
dto.setCznr(item.getHandleAdvice());
AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
czr.setId(item.getGridPartyid());
czr.setXm(item.getGridPartyname());
czr.setSsjgbm(item.getGridUnitid());
czr.setSsjg(item.getGridUnitname());
czr.setSsbmbm(item.getGridUnitid());
czr.setSsbm(item.getGridUnitname());
dto.setCzr(czr);
// 组装好直接推送
cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求废弃");
});
}
}
@ -178,38 +202,38 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 组装数据
// for (ItemHandleProcessCaseClosedToCityDTO item: itemProcessDto) {
PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态
data.setSqzt(CityPushStateEnum.YJA.getCode());
// 当前处理环节
data.setDqclhj(CityPushLinkEnum.JA.getCode());
// 处置结果
data.setCzjg(NumConstant.ONE_STR);
// 结案时间
data.setCzsj(item.getCreatedTime().toString());
// 操作人
PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO();
// 操作人员名称
czr.setXm(item.getGridPartyname());
// 操作人员唯一标识
czr.setId(item.getGridPartyid());
// 所属机构Id
czr.setSsjgid(item.getGridUnitid());
// 所属机构
czr.setSsjg(item.getGridUnitname());
//所属部门id
czr.setSsbmid(item.getGridUnitid());
// 所属部门名称
czr.setSsbmmc(item.getGridUnitname());
// 传数据
data.setCzr(czr);
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.CASE_CLOSED, "诉求结案");
saveLog(item.getItemId(), item.getId(), "诉求结案", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(data), result);
PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态
data.setSqzt(CityPushStateEnum.YJA.getCode());
// 当前处理环节
data.setDqclhj(CityPushLinkEnum.JA.getCode());
// 处置结果
data.setCzjg(NumConstant.ONE_STR);
// 结案时间
data.setCzsj(item.getCreatedTime().toString());
// 操作人
PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO();
// 操作人员名称
czr.setXm(item.getGridPartyname());
// 操作人员唯一标识
czr.setId(item.getGridPartyid());
// 所属机构Id
czr.setSsjgid(item.getGridUnitid());
// 所属机构
czr.setSsjg(item.getGridUnitname());
//所属部门id
czr.setSsbmid(item.getGridUnitid());
// 所属部门名称
czr.setSsbmmc(item.getGridUnitname());
// 传数据
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();
}
@ -303,7 +327,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_CZ.getValue()), date);
}
// 添加值
for(ItemHandleProcessDTO item : list) {
for (ItemHandleProcessDTO item : list) {
DispatchAuditResultDto data = new DispatchAuditResultDto();
// 诉求id
@ -338,7 +362,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setCzr(dto);
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.DISP_ATCH_AUDIT, "派遣审核");
saveLog(item.getItemId(),item.getId(),"派遣审核",PushToCityGridConstant.DISP_ATCH_AUDIT,JSONObject.toJSONString(data),result);
saveLog(item.getItemId(), item.getId(), "派遣审核", PushToCityGridConstant.DISP_ATCH_AUDIT, JSONObject.toJSONString(data), result);
}
return new Result();
}
@ -396,46 +420,46 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
* @date 2022/9/19 10:22
*/
@Override
public Result AppealReporting(String itemId,Integer states) {
public Result AppealReporting(String itemId, Integer states) {
int state = states; // ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue();
ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(state,itemId);
ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(state, itemId);
// 处理数据
// for(ItemHandleProcessToCityResultDTO item : list) {
AppealReportResultDTO data = new AppealReportResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态（未知）
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节（未知）
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
// 上报时间
data.setCzsj(item.getCreatedTime());
// 上报原因
data.setCznr(item.getHandleAdvice());
// 操作人
AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构id
dto.setSsjgid(item.getGridUnitid());
// 所属机构名称
dto.setSsjgmc(item.getGridUnitname());
// 所属部门id
dto.setSsbmid(item.getGridUnitid());
// 所属部门名称
dto.setSsbmmc(item.getGridUnitname());
// 组装完成，推送
data.setCzr(dto);
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_REPORT, "诉求上报");
saveLog(item.getItemId(),item.getId(),"诉求上报",PushToCityGridConstant.APPEAL_REPORT, JSONObject.toJSONString(data),result);
AppealReportResultDTO data = new AppealReportResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态（未知）
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节（未知）
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
// 上报时间
data.setCzsj(item.getCreatedTime());
// 上报原因
data.setCznr(item.getHandleAdvice());
// 操作人
AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构id
dto.setSsjgid(item.getGridUnitid());
// 所属机构名称
dto.setSsjgmc(item.getGridUnitname());
// 所属部门id
dto.setSsbmid(item.getGridUnitid());
// 所属部门名称
dto.setSsbmmc(item.getGridUnitname());
// 组装完成，推送
data.setCzr(dto);
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_REPORT, "诉求上报");
saveLog(item.getItemId(), item.getId(), "诉求上报", PushToCityGridConstant.APPEAL_REPORT, JSONObject.toJSONString(data), result);
// }
return new Result();
}
@ -456,39 +480,39 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 处理数据
// for(ItemHandleProcessToCityResultDTO item : list) {
ReportRejectionResultDTO data = new ReportRejectionResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态（未知）
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节（未知）
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
// 驳回时间
data.setCzsj(item.getCreatedTime());
// 驳回原因
data.setCznr(item.getHandleAdvice());
// 操作人
ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构id
dto.setSsjgid(item.getGridUnitid());
// 所属机构名称
dto.setSsjgmc(item.getGridUnitname());
// 所属部门id
dto.setSsbmid(item.getGridUnitid());
// 所属部门名称
dto.setSsbmmc(item.getGridUnitname());
// 组装完成，推送
data.setCzr(dto);
ReportRejectionResultDTO data = new ReportRejectionResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态（未知）
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节（未知）
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
// 驳回时间
data.setCzsj(item.getCreatedTime());
// 驳回原因
data.setCznr(item.getHandleAdvice());
// 操作人
ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构id
dto.setSsjgid(item.getGridUnitid());
// 所属机构名称
dto.setSsjgmc(item.getGridUnitname());
// 所属部门id
dto.setSsbmid(item.getGridUnitid());
// 所属部门名称
dto.setSsbmmc(item.getGridUnitname());
// 组装完成，推送
data.setCzr(dto);
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.REPORT_REBUT, "上报驳回");
saveLog(item.getItemId(),item.getId(),"上报驳回",PushToCityGridConstant.REPORT_REBUT,JSONObject.toJSONString(data),result);
saveLog(item.getItemId(), item.getId(), "上报驳回", PushToCityGridConstant.REPORT_REBUT, JSONObject.toJSONString(data), result);
// }
return new Result();
}
@ -504,69 +528,69 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
@Override
public Result AppealHandling(ItemHandleProcessDTO Prodto) {
String id = Prodto.getId(); // ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue();
AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id,Prodto.getItemId());
AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, Prodto.getItemId());
// 处理数据
// for(AppealHandlingToCityResultDTO item : list) {
AppealHandlingResultDTO data = new AppealHandlingResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
// 执法类型添加类型，纪要，进度字段
if(item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
// 诉求类型（未知）
data.setSqlx(NumConstant.TWO_STR);
// 会议纪要（未知）
data.setHyjy(item.getLawContent());
// 责任分工处理
String hostUnit = item.getHostUnit().trim().replaceAll("|",","); // 主办
String assistUnit = item.getAssistUnit().trim().replaceAll("|",","); // 协办
data.setZrfg(hostUnit + "," + assistUnit);
// 办理进度
data.setBljd("");
}
// 处理时间
data.setCzsj(item.getCreatedTime());
// 处理内容
data.setCznr(item.getHandleAdvice());
AppealHandlingResultDTO data = new AppealHandlingResultDTO();
// 诉求id
data.setSqid(getSqid(item.getItemId()));
// 诉求状态
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
// 执法类型添加类型，纪要，进度字段
if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
// 诉求类型（未知）
data.setSqlx(NumConstant.TWO_STR);
// 会议纪要（未知）
data.setHyjy(item.getLawContent());
// 责任分工处理
String hostUnit = item.getHostUnit().trim().replaceAll("|", ","); // 主办
String assistUnit = item.getAssistUnit().trim().replaceAll("|", ","); // 协办
data.setZrfg(hostUnit + "," + assistUnit);
// 办理进度
data.setBljd("");
}
// 处理照片
List<String> urlList = itemHandleProcessDao.getURL(item.getItemId());
String url = "";
for (String i : urlList) {
url = i + "," + url;
}
data.setClzp(url);
// 处理时间
data.setCzsj(item.getCreatedTime());
// 处理内容
data.setCznr(item.getHandleAdvice());
// 操作人
AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构id
dto.setSsjgid(item.getGridUnitid());
// 所属机构名称
dto.setSsjgmc(item.getGridUnitname());
// 所属部门id
dto.setSsbmid(item.getGridUnitid());
// 所属部门名称
dto.setSsbmmc(item.getGridUnitname());
// 组装完成，推送
data.setCzr(dto);
// 处理照片
List<String> urlList = itemHandleProcessDao.getURL(item.getItemId());
String url = "";
for (String i : urlList) {
url = i + "," + url;
}
data.setClzp(url);
// 操作人
AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构id
dto.setSsjgid(item.getGridUnitid());
// 所属机构名称
dto.setSsjgmc(item.getGridUnitname());
// 所属部门id
dto.setSsbmid(item.getGridUnitid());
// 所属部门名称
dto.setSsbmmc(item.getGridUnitname());
// 组装完成，推送
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();
}
@ -595,8 +619,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
/**
* 获取诉求编码，接口2-21可用
*
@ -605,12 +627,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
* @author zhy
* @date 2022/9/19 11:07
*/
private String getSqid(String itemId){
private String getSqid(String itemId) {
return itemService.getSqid(itemId);
}
/**
* 2.8 诉求退件
*
* @author sun
*/
@Override
@ -652,6 +675,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
/**
* 2.9 退件审核
*
* @author sun
*/
@Override
@ -695,6 +719,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
/**
* 2.10 延期申请
*
* @author sun
*/
@Override
@ -738,6 +763,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
/**
* 2.11 延期审核
*
* @author sun
*/
@Override
@ -805,7 +831,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqzt(CityPushStateEnum.DYS.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_PJ.getCode());
//评价结果 0：满意；1：基本满意；2：不满意
switch(item.getEvaluationScore()) {
switch (item.getEvaluationScore()) {
case NumConstant.ZERO:
dto.setCzjg(NumConstant.TWO_STR);
break;

Write Preview
Loading…
Cancel
Save