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

修改判断，时间格式，部门名称

feature/dangjian
HAHA 4 years ago
parent
25b3499238
commit
dec768e73f
3 changed files with 39 additions and 33 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. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java
  3. 68
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealReportResultDTO.java
View File

@ -19,7 +19,7 @@ public class AppealReportResultDTO {
@JsonProperty("czr")
private CzrDTO czr;
@JsonProperty("czsj")
private Date czsj;
private String czsj;
@JsonProperty("cznr")
private String cznr;

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportRejectionResultDTO.java
View File

@ -19,7 +19,7 @@ public class ReportRejectionResultDTO {
@JsonProperty("czr")
private CzrDTO czr;
@JsonProperty("czsj")
private Date czsj;
private String czsj;
@JsonProperty("cznr")
private String cznr;

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

@ -30,6 +30,7 @@ import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.PushToCityGridConstant;
import com.elink.esua.epdc.dto.CityCenterFromDTO;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
@ -57,6 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@ -235,9 +237,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 操作人员唯一标识
czr.setId(item.getGridPartyid() + "001");
// 所属机构Id
czr.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
czr.setSsjgbm(getJgbm(item.getHandlerDeptId()));
// 所属机构
czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
czr.setSsjg(item.getGridUnitname() + "机构111");
//所属部门id
czr.setSsbmbm(item.getGridUnitid() + "003");
// 所属部门名称
@ -448,28 +450,28 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setSqid(getSqid(item.getItemId()));
// 上报时间
data.setCzsj(item.getCreatedTime());
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
// 上报原因
data.setCznr(item.getHandleAdvice());
// 操作人
AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO();
if(source.equals(NumConstant.ONE_STR)) { // 0是自己平台
// 诉求状态（未知）
if(source.equals(NumConstant.ZERO_STR)) { // 0是自己平台
// 诉求状态
data.setSqzt(CityPushStateEnum.DCL.getCode());
// 当前处理环节（未知）
// 当前处理环节
data.setDqclhj(CityPushLinkEnum.ZJYP.getCode());
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人姓名 todo
dto.setXm("HAHA");
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
// 所属机构名称
dto.setSsjg(item.getGridUnitname());
dto.setId(item.getCreatedBy());
// 所属部门id
dto.setSsbmbm(item.getGridUnitid());
dto.setSsbmbm(item.getHandlerDeptId() + "");
// 所属部门名称
dto.setSsbm(item.getGridUnitname());
dto.setSsbm(item.getHandlerDept());
// 所属机构编码
Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(item.getHandlerDeptId());
if (dtoResult.success() && null != dtoResult.getData()) {
@ -477,14 +479,22 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
if(sysDeptDTO.getTypeKey().equals("community_party")) {
// 所属机构id
dto.setSsjgbm(sysDeptDTO.getDisCenterZoningCode());
// todo
dto.setSsjg("社区部门名称");
}else if(sysDeptDTO.getTypeKey().equals("grid_party")) {
dto.setSsjgbm(adminFeignClient.getCompleteDept(item.getHandlerDeptId()).toString());
Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(item.getHandlerDeptId());
CompleteDeptDTO completeDeptDTO = completeDept.getData();
dto.setSsjgbm(completeDeptDTO.getCommunityDisCenterZoningCode());
dto.setSsjg(completeDeptDTO.getCommunity());
}
}
} else { // 1是网格化
dto.setXm(item.getCreatedBy());
dto.setSsbmbm(item.getHandlerDeptId()+"");
dto.setSsbm(item.getHandlerDept());
dto.setId(item.getGridPartyid());
dto.setXm(item.getGridPartyname());
dto.setSsjgbm(item.getGridUnitid());
dto.setSsjg(item.getGridUnitname());
dto.setSsbmbm(item.getGridUnitid());
dto.setSsbm(item.getGridUnitname());
// 诉求状态（未知）
data.setSqzt(CityPushStateEnum.DPQ.getCode());
@ -526,7 +536,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 当前处理环节（未知）
data.setDqclhj(CityPushLinkEnum.ZJYP.getCode());
// 驳回时间
data.setCzsj(item.getCreatedTime());
data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
// 驳回原因
data.setCznr(item.getHandleAdvice());
@ -537,9 +547,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 操作人员唯一标识
dto.setId(item.getGridPartyid() + "0001");
// 所属机构id
dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
dto.setSsjgbm(getJgbm(item.getHandlerDeptId()));
// 所属机构名称
dto.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR));
dto.setSsjg(item.getGridUnitname() + "机构222");
// 所属部门id
dto.setSsbmbm(item.getGridUnitid() + "0003");
// 所属部门名称
@ -963,8 +973,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
czr.setXm(item.getNickName());
czr.setSsbmbm(item.getGridId().toString());
czr.setSsbm(item.getGrid());
czr.setSsjgbm(getJgbm(item.getGridId(), NumConstant.ZERO_STR));
czr.setSsjg(getJgbm(item.getGridId(), NumConstant.ONE_STR));
czr.setSsjgbm(getJgbm(item.getGridId()));
czr.setSsjg(item.getGrid());
dto.setCzr(czr);
// 组装好直接推送
@ -1157,8 +1167,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO();
czr.setId(entity.getGridPartyid());
czr.setXm(entity.getGridPartyname());
czr.setSsjgbm(getJgbm(entity.getHandlerDeptId(), NumConstant.ZERO_STR));
czr.setSsjg(getJgbm(entity.getHandlerDeptId(), NumConstant.ONE_STR));
czr.setSsjgbm(getJgbm(entity.getHandlerDeptId()));
czr.setSsjg(entity.getGridUnitname());
czr.setSsbmbm(entity.getGridUnitid());
czr.setSsbm(entity.getGridUnitname());
dto.setCzr(czr);
@ -1185,22 +1195,18 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
/**
* 获取机构编码
* @Param type 0返回编码，1返回名字
* @Param peopleFlag
* @Param deptId
* @Return {@link String}
* @Author zhaoqifeng
* @Date 2022/9/23 16:58
*/
private String getJgbm(Long deptId, String type) {
private String getJgbm(Long deptId) {
CityCenterFromDTO formDTO = new CityCenterFromDTO();
formDTO.setDeptId(deptId);
Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
if (dept.success()) {
if (NumConstant.ZERO_STR.equals(type)) {
return dept.getData().getDisCenterZoningCode();
} else {
return dept.getData().getName();
}
return dept.getData().getDisCenterZoningCode();
}
return "";
}

Write Preview
Loading…
Cancel
Save