Browse Source

时间格式修改

feature/dangjian
zhaoqifeng 3 years ago
parent
commit
c5e42c4b64
  1. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealHandlingResultDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionApplyResultDTO.java
  3. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EarlyInspectionResultDTO.java
  4. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EndInspectionResultDTO.java
  5. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/EvaluationResultDTO.java
  6. 24
      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/AppealHandlingResultDTO.java

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

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

@ -33,7 +33,7 @@ public class EarlyInspectionApplyResultDTO implements Serializable {
/** /**
* 申请时间 * 申请时间
*/ */
private Date sqsj; private String sqsj;
/** /**
* 申请内容 * 申请内容
*/ */

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

@ -38,7 +38,7 @@ public class EarlyInspectionResultDTO implements Serializable {
/** /**
* 初验时间 * 初验时间
*/ */
private Date czsj; private String czsj;
/** /**
* 初验意见 * 初验意见
*/ */

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

@ -38,7 +38,7 @@ public class EndInspectionResultDTO implements Serializable {
/** /**
* 终验时间 * 终验时间
*/ */
private Date czsj; private String czsj;
/** /**
* 终验意见 * 终验意见
*/ */

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

@ -38,7 +38,7 @@ public class EvaluationResultDTO implements Serializable {
/** /**
* 评价时间 * 评价时间
*/ */
private Date czsj; private String czsj;
/** /**
* 评价意见 * 评价意见
*/ */

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

@ -182,7 +182,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId())); dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.FQ.getCode()); dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode()); dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(item.getCreatedTime().toString()); dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCznr(item.getHandleAdvice()); dto.setCznr(item.getHandleAdvice());
AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO(); AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
czr.setId(item.getGridPartyid()); czr.setId(item.getGridPartyid());
@ -226,7 +226,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 处置结果 // 处置结果
data.setCzjg(NumConstant.ONE_STR); data.setCzjg(NumConstant.ONE_STR);
// 结案时间 // 结案时间
data.setCzsj(item.getCreatedTime().toString()); data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
// 操作人 // 操作人
PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO(); PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO();
@ -262,7 +262,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
AppealSuperviseResultDTO dto = new AppealSuperviseResultDTO(); AppealSuperviseResultDTO dto = new AppealSuperviseResultDTO();
dto.setSqid(sqId); dto.setSqid(sqId);
dto.setDbr(item.getGridPartyname()); dto.setDbr(item.getGridPartyname());
dto.setDbsj(item.getCreatedTime().toString()); dto.setDbsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setDbnr(item.getHandleAdvice()); dto.setDbnr(item.getHandleAdvice());
// 组装好直接推送 // 组装好直接推送
String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办"); String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办");
@ -279,7 +279,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId())); dto.setSqid(getSqid(item.getItemId()));
dto.setDbr(item.getGridPartyname()); dto.setDbr(item.getGridPartyname());
dto.setDbsj(item.getCreatedTime().toString()); dto.setDbsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setDbnr(item.getHandleAdvice()); dto.setDbnr(item.getHandleAdvice());
// 组装好直接推送 // 组装好直接推送
String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办"); String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办");
@ -395,7 +395,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqid(getSqid(item.getItemId())); dto.setSqid(getSqid(item.getItemId()));
dto.setBhr(item.getGridPartyname()); dto.setBhr(item.getGridPartyname());
dto.setBhrId(item.getGridPartyid()); dto.setBhrId(item.getGridPartyid());
dto.setBhsj(item.getCreatedTime().toString()); dto.setBhsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setBhyy(item.getHandleAdvice()); dto.setBhyy(item.getHandleAdvice());
// 组装好直接推送 // 组装好直接推送
cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_WHISTLE_REPORT_REJECT, "吹哨驳回"); cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_WHISTLE_REPORT_REJECT, "吹哨驳回");
@ -418,7 +418,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setClrId(item.getGridPartyid()); dto.setClrId(item.getGridPartyid());
dto.setCldw(item.getGridUnitname()); dto.setCldw(item.getGridUnitname());
dto.setCldwId(item.getGridUnitid()); dto.setCldwId(item.getGridUnitid());
dto.setFksj(item.getCreatedTime().toString()); dto.setFksj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
dto.setCljg(item.getHandleAdvice()); dto.setCljg(item.getHandleAdvice());
// 组装好直接推送 // 组装好直接推送
cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_WHISTLE_FEEDBACK, "吹哨反馈"); cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_WHISTLE_FEEDBACK, "吹哨反馈");
@ -625,7 +625,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setClfj(clfjList); data.setClfj(clfjList);
} }
// 处理时间 // 处理时间
data.setCzsj(item.getCreatedTime()); data.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
// 处理内容 // 处理内容
data.setCznr(item.getHandleAdvice()); data.setCznr(item.getHandleAdvice());
// 处理照片 // 处理照片
@ -954,7 +954,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
break; break;
} }
//评价时间 //评价时间
dto.setCzsj(item.getEvaluationTime()); dto.setCzsj(DateUtils.format(item.getEvaluationTime(),DateUtils.DATE_TIME_PATTERN));
//评价意见 //评价意见
dto.setCzyj(item.getEvaluationContent()); dto.setCzyj(item.getEvaluationContent());
//评价人员 //评价人员
@ -1009,7 +1009,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//申请内容 //申请内容
dto.setSqnr(item.getHandleAdvice()); dto.setSqnr(item.getHandleAdvice());
//申请时间 //申请时间
dto.setSqsj(item.getCreatedTime()); dto.setSqsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
//申请人员 //申请人员
EarlyInspectionApplyResultDTO.SqrBean sqr = new EarlyInspectionApplyResultDTO.SqrBean(); EarlyInspectionApplyResultDTO.SqrBean sqr = new EarlyInspectionApplyResultDTO.SqrBean();
sqr.setId(item.getGridPartyid()); sqr.setId(item.getGridPartyid());
@ -1063,7 +1063,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setCzjg(NumConstant.ZERO_STR); dto.setCzjg(NumConstant.ZERO_STR);
} }
//初验时间 //初验时间
dto.setCzsj(item.getCreatedTime()); dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
//初验意见 //初验意见
dto.setCzyj(item.getHandleAdvice()); dto.setCzyj(item.getHandleAdvice());
//初验人员 //初验人员
@ -1122,7 +1122,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setCzjg(NumConstant.ZERO_STR); dto.setCzjg(NumConstant.ZERO_STR);
} }
//终验时间 //终验时间
dto.setCzsj(item.getCreatedTime()); dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
//终验意见 //终验意见
dto.setCzyj(item.getHandleAdvice()); dto.setCzyj(item.getHandleAdvice());
//终验人员 //终验人员
@ -1152,7 +1152,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setSqzt(CityPushStateEnum.DJA.getCode()); dto.setSqzt(CityPushStateEnum.DJA.getCode());
dto.setDqclhj(CityPushLinkEnum.KSLDSH.getCode()); dto.setDqclhj(CityPushLinkEnum.KSLDSH.getCode());
dto.setCzjg(NumConstant.ONE_STR); dto.setCzjg(NumConstant.ONE_STR);
dto.setCzsj(entity.getCreatedTime().toString()); dto.setCzsj(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
dto.setCzyj(entity.getHandleAdvice()); dto.setCzyj(entity.getHandleAdvice());
AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO(); AppealAuditResultDTO.CzrDTO czr = new AppealAuditResultDTO.CzrDTO();
czr.setId(entity.getGridPartyid()); czr.setId(entity.getGridPartyid());

Loading…
Cancel
Save