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

字段补全赋值问题

feature/dangjian
sunyuchao 3 years ago
parent
e90b53a813
commit
e05b27e95d
4 changed files with 63 additions and 20 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. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java
  2. 11
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
  3. 33
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  4. 27
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

12
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java
View File

@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.item.form;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @program: esua-epdc
@ -18,6 +19,10 @@ public class CityCaseLivelihoodDTO implements Serializable {
*唯一标识
*/
private String id;
/**
* 编码
*/
private String sqbm;
/**
*紧急程度 01一般 02紧急
@ -77,7 +82,12 @@ public class CityCaseLivelihoodDTO implements Serializable {
/**
*诉求登记日期
*/
private String sqdjrq;
private Date sqdjrq;
/**
*诉求处理截止日期 非必填
*/
private Date jzrq;
/**
*诉求登记人

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

@ -34,6 +34,7 @@ import com.elink.esua.epdc.constant.EventsNoticeConstant;
import com.elink.esua.epdc.constant.ImageConstant;
import com.elink.esua.epdc.constant.SysSmsTemplateConstant;
import com.elink.esua.epdc.constants.MenuCodeConstant;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.MenuNoticeDTO;
import com.elink.esua.epdc.dto.PointLogFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
@ -53,6 +54,7 @@ import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.comment.service.EventCommentService;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
import com.elink.esua.epdc.modules.events.service.ImgService;
import com.elink.esua.epdc.modules.feign.AdminFeignClient;
import com.elink.esua.epdc.modules.feign.GroupFeignClient;
import com.elink.esua.epdc.modules.feign.PointFeignClient;
import com.elink.esua.epdc.modules.issue.dao.IssueDao;
@ -124,6 +126,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
@Autowired
private PointFeignClient pointFeignClient;
@Autowired
private AdminFeignClient adminFeignClient;
@Override
public PageData<IssueWaitHandleOrClosedDTO> listOfIssues(Map<String, Object> params) {
@ -466,7 +470,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
//默认设置为民生诉求
itemEntity.setIsPeople("1");//诉求上报
itemEntity.setPeopleFlag("0");//民生诉求
itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS"));
//民生诉求所属网格对应的所属社区的市中心编码
Result<CompleteDeptDTO> result = adminFeignClient.getCompleteDept(issueEntity.getGridId());
if(!result.success()){
throw new RenException(result.getMsg());
}
itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + result.getData().getCommunityDisCenterZoningCode()));
return itemEntity;
}

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

@ -417,8 +417,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemEntity.setItemCode("PT" + System.currentTimeMillis());//项目编号
itemEntity.setIsPeople("1");//诉求上报
itemEntity.setPeopleFlag("2");//执法诉求
//执法诉求所属街道的市中心编码
Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(userDetail.getDeptId());
if (!dtoResult.success()) {
throw new RenException(dtoResult.getMsg());
}
// 流水号
itemEntity.setSerialNum(getSerialNum("ZF"));
itemEntity.setSerialNum(getSerialNum("ZF" + dtoResult.getData().getDisCenterZoningCode()));
baseDao.insert(itemEntity);
//插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(itemEntity);
@ -2782,10 +2787,21 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
entity.setFirstCategoryCode("13");
entity.setItemCode("PT" + System.currentTimeMillis());//项目编号
entity.setIsPeople("1");//诉求上报
String code = "";
if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
entity.setSerialNum(getSerialNum("MS"));
//民生诉求所属网格对应的所属社区的市中心编码
Result<CompleteDeptDTO> result = adminFeignClient.getCompleteDept(entity.getGridId());
if(result.success()){
code = result.getData().getCommunityDisCenterZoningCode();
}
entity.setSerialNum(getSerialNum("MS" + code));
} else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
entity.setSerialNum(getSerialNum("FZ"));
//执法诉求所属街道的市中心编码
Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId());
if (!dtoResult.success()) {
code = dtoResult.getData().getDisCenterZoningCode();
}
entity.setSerialNum(getSerialNum("FZ" + code));
}
baseDao.insert(entity);
//插入项目部门关联表
@ -2832,6 +2848,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
private void sendCaseLivelihood(ItemEntity entity) {
CityCaseLivelihoodDTO data = new CityCaseLivelihoodDTO();
data.setId(entity.getId());
data.setSqbm(entity.getSerialNum());
data.setJjcd(CityPushEnum.JJCD_YB.getCode());
data.setSqly(CityPushEnum.SQLY_WX.getCode());
data.setSqzt(CityPushEnum.SQZT_DPQ.getCode());
@ -2845,7 +2862,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6,BigDecimal.ROUND_HALF_UP).doubleValue();
Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6,BigDecimal.ROUND_HALF_UP).doubleValue();
data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
//data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
data.setSqdjrq(entity.getCreatedTime());
//data.setJzrq();
//诉求登记人
CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO();
sqdjr.setId(entity.getId());
@ -3218,7 +3237,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
*/
public String getSerialNum(String prefix) {
String serialNum = prefix;
String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME_HOUR);
String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME);
serialNum = serialNum + dateStr;
String key = RedisKeys.getSerialNumKey(serialNum);
@ -3226,12 +3245,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (null != obj) {
int number = (int) obj;
number = number + 1;
String numStr = String.format("%04d", number);
String numStr = String.format("%05d", number);
redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE);
return serialNum + numStr;
}
int number = 1;
String numStr = "0001";
String numStr = "00001";
redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE);
return serialNum + numStr;

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

@ -112,7 +112,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
data.setCzsj(item.getCreatedTime());
data.setCznr(item.getHandleAdvice());
//data.setClqx("");//处理期限
data.setClqx(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));//处理期限
// 组装派遣人
AppealDispatchResultDto.CzrDTO czrDTO = new AppealDispatchResultDto.CzrDTO();
@ -707,8 +707,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
list.forEach(item -> {
RebutResultDTO dto = new RebutResultDTO();
dto.setSqid(getSqid(item.getItemId()));
//dto.setSqzt(CityPushStateEnum.FQ.getCode());
//dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setSqzt(CityPushStateEnum.DCL.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
dto.setCzsj(item.getCreatedTime());
dto.setCznr(item.getHandleAdvice());
RebutResultDTO.CzrDTO czr = new RebutResultDTO.CzrDTO();
@ -749,7 +749,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
list.forEach(item -> {
RebutAuditResultDTO dto = new RebutAuditResultDTO();
dto.setSqid(getSqid(item.getItemId()));
//dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setSqzt(CityPushStateEnum.DSH.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setCzsj(item.getCreatedTime());
dto.setShjg("0");
@ -793,10 +793,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
list.forEach(item -> {
DelayApplyResultDTO dto = new DelayApplyResultDTO();
dto.setSqid(getSqid(item.getItemId()));
//dto.setSqzt(CityPushStateEnum.FQ.getCode());
//dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setSqzt(CityPushStateEnum.DCL.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
//延期时限 诉求处理的最后时限 如：2022-09-01 18:23:00前完成
//dto.setYqsx(new Date());
dto.setYqsx(new Date());
dto.setSqsj(item.getCreatedTime());
dto.setSqnr(item.getHandleAdvice());
DelayApplyResultDTO.SqrDTO sqr = new DelayApplyResultDTO.SqrDTO();
@ -837,8 +837,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
list.forEach(item -> {
DelayAuditResultDTO dto = new DelayAuditResultDTO();
dto.setSqid(getSqid(item.getItemId()));
//dto.setSqzt(CityPushStateEnum.FQ.getCode());
//dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setSqzt(CityPushStateEnum.DSH.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
dto.setCzjg("1");
dto.setYqsj(item.getCreatedTime());
dto.setCzsj(item.getCreatedTime());
@ -859,6 +859,11 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
/**
* 再处理、向上申请
*
* @author sun
*/
@Override
public void again(ItemHandleProcessDTO formDTO) {
//1.判断上一个流程节点是否是退回
@ -877,8 +882,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
ItemHandleProcessEntity item = itemHandleProcessDao.selectById(formDTO.getId());
RebutAuditResultDTO dto = new RebutAuditResultDTO();
dto.setSqid(getSqid(item.getItemId()));
//dto.setSqzt(CityPushStateEnum.FQ.getCode());
dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
dto.setSqzt(CityPushStateEnum.DCL.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
dto.setCzsj(item.getCreatedTime());
dto.setShjg("1");//审核通过
dto.setCznr(item.getHandleAdvice());

Write Preview
Loading…
Cancel
Save