Browse Source

换一下名字

feature/dangjian
zhangyuan 3 years ago
parent
commit
80961642ea
  1. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java
  2. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  3. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
  4. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  5. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java

@ -159,7 +159,7 @@ public class EpdcAppItemController {
@PostMapping(value = "people/submitItem")
public Result submitItem(@RequestBody SubmitItemFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return itemService.submitItem(formDto);
return itemService.submitMsFzItemResi(formDto);
}
}

4
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@ -191,7 +191,7 @@ public class ItemController {
@PostMapping("itemHandleSubmit")
public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return itemService.modifyHandleResult(dto);
return itemService.submitItem(dto);
}
@PostMapping
@ -447,7 +447,7 @@ public class ItemController {
@PostMapping("examineCase")
public Result examineCase(@RequestBody ExamineCaseFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return itemService.examineCase(formDto);
return itemService.submitJaItem(formDto);
}
/**

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java

@ -1,6 +1,5 @@
package com.elink.esua.epdc.modules.item.controller;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* 移动端-项目表
@ -107,7 +105,7 @@ public class WorkItemController {
@PostMapping("itemHandleSubmit")
public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return itemService.modifyHandleResult(dto);
return itemService.submitItem(dto);
}
/**
@ -120,7 +118,7 @@ public class WorkItemController {
@PostMapping("examineCaseWork")
public Result examineCaseWork(@RequestBody ExamineCaseFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return itemService.examineCase(formDto);
return itemService.submitJaItem(formDto);
}
@PostMapping("syc")
@ -214,7 +212,7 @@ public class WorkItemController {
@PostMapping("handleSubmit")
public Result handleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) {
ValidatorUtils.validateEntity(dto);
return itemService.modifyHandleResult(dto);
return itemService.submitItem(dto);
}
/**
* 获取满意度评价部门--工作端
@ -266,7 +264,7 @@ public class WorkItemController {
*/
@PostMapping("submitLawItem")
public Result submitLawItem(@RequestBody ItemLawSubmitDTO formDto) {
return itemService.submitLawItem(formDto);
return itemService.submitZfItemWork(formDto);
}
/**

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

@ -311,7 +311,7 @@ public interface ItemService extends BaseService<ItemEntity> {
* @Author: liuchuang
* @Date: 2019/9/16 19:10
*/
Result modifyHandleResult(ItemHandleSubmitFormDTO dto);
Result submitItem(ItemHandleSubmitFormDTO dto);
/**
* 项目内容详情
@ -549,7 +549,7 @@ public interface ItemService extends BaseService<ItemEntity> {
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result submitItem(SubmitItemFormDTO formDto);
Result submitMsFzItemResi(SubmitItemFormDTO formDto);
/**
* @describe: 居民端-北尚诉办-我的上报
@ -567,7 +567,7 @@ public interface ItemService extends BaseService<ItemEntity> {
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result submitLawItem(ItemLawSubmitDTO formDto);
Result submitZfItemWork(ItemLawSubmitDTO formDto);
/**
* @describe: 北尚诉求列表
@ -622,7 +622,7 @@ public interface ItemService extends BaseService<ItemEntity> {
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result examineCase(ExamineCaseFormDTO formDto);
Result submitJaItem(ExamineCaseFormDTO formDto);
/**
* @describe: 接受网格化平台项目处理结果结案/驳回

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

@ -610,7 +610,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
@Transactional(rollbackFor = Exception.class)
public Result submitLawItem(ItemLawSubmitDTO formDto) {
public Result submitZfItemWork(ItemLawSubmitDTO formDto) {
UserDetail userDetail = SecurityUser.getUser();
if (null == userDetail) {
throw new RenException("获取用户信息失败");
@ -1462,7 +1462,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
@Transactional(rollbackFor = Exception.class)
public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) {
public Result submitItem(ItemHandleSubmitFormDTO dto) {
try {
Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
log.info("处理项目-deptMessage:" + deptMessage);
@ -3304,7 +3304,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
@Transactional
public Result submitItem(SubmitItemFormDTO formDto) {
public Result submitMsFzItemResi(SubmitItemFormDTO formDto) {
ItemEntity entity = ConvertUtils.sourceToTarget(formDto, ItemEntity.class);
entity.setDistributeTime(new Date());
entity.setItemState(0);//处理中
@ -3730,7 +3730,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
@Transactional(rollbackFor = Exception.class)
public Result examineCase(ExamineCaseFormDTO formDto) {
public Result submitJaItem(ExamineCaseFormDTO formDto) {
UserDetail user = SecurityUser.getUser();
if (null == user) {
throw new RenException("获取用户信息失败");

Loading…
Cancel
Save