|
|
|
@ -113,6 +113,7 @@ import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.web.bind.annotation.RequestParam; |
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
@ -229,6 +230,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private ItemProcessModifyProducer itemProcessModifyProducer; |
|
|
|
@Resource |
|
|
|
private ItemDeptDao itemDeptDao; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageData<ItemDTO> page(Map<String, Object> params) { |
|
|
|
@ -1599,14 +1602,21 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
itemCirculationDeptResultDTO.setSelected(false); |
|
|
|
itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey()); |
|
|
|
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>(); |
|
|
|
deptList.add(itemCirculationDeptResultDTO); |
|
|
|
dto.setDeptResultDTOS(deptList); |
|
|
|
|
|
|
|
|
|
|
|
handleProcessEntity.setState(dto.getHandleCategory()); |
|
|
|
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(sysDeptDTO.getTypeKey())) { |
|
|
|
// 操作部门是网格时,存入结案审批部门
|
|
|
|
handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid()); |
|
|
|
} else { |
|
|
|
//社区结案申请直接上报到区平台
|
|
|
|
itemCirculationDeptResultDTO.setDeptId(1175270520603930625L); |
|
|
|
itemCirculationDeptResultDTO.setDeptName("区中心"); |
|
|
|
itemCirculationDeptResultDTO.setTypeKey(OrganizationTypeConstant.ORG_TYPE_DISTRICT_PARTY); |
|
|
|
handleProcessEntity.setGridNextcantoncode("370203"); |
|
|
|
} |
|
|
|
deptList.add(itemCirculationDeptResultDTO); |
|
|
|
dto.setDeptResultDTOS(deptList); |
|
|
|
|
|
|
|
// 获取已流转部门信息
|
|
|
|
List<Long> oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId()); |
|
|
|
@ -2353,7 +2363,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_MS); |
|
|
|
if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { |
|
|
|
//结案申请
|
|
|
|
// sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO);
|
|
|
|
sendDto.setSENDACTDEFID(CommonConstants.PARTY_SEND_TO); |
|
|
|
sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ZERO); |
|
|
|
} else { |
|
|
|
//吹哨
|
|
|
|
@ -3754,6 +3764,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
//同意
|
|
|
|
process.setState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); |
|
|
|
process.setOutHandleAdvice("街道网格化平台正在处理。"); |
|
|
|
process.setGridNextcantoncode("370203"); |
|
|
|
} else if ("1".equals(formDto.getCheckFlag())) { |
|
|
|
//不同意,返回网格待处理列表
|
|
|
|
process.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY_REJECT.getValue()); |
|
|
|
@ -4540,10 +4551,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
//二次放入缓存取出的数据此时已经上报了评价接口,并且已经评价了,走结案
|
|
|
|
closed(id); |
|
|
|
} else if (NumConstant.THREE_STR.equals(type)) { |
|
|
|
//诉求审核
|
|
|
|
//初验申请
|
|
|
|
ItemHandleProcessDTO dto = new ItemHandleProcessDTO(); |
|
|
|
|
|
|
|
|
|
|
|
//1.获取项目基础数据
|
|
|
|
ItemEntity entity = baseDao.selectById(id); |
|
|
|
ItemHandleProcessEntity processEntity = new ItemHandleProcessEntity(); |
|
|
|
@ -4564,6 +4574,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
processEntity.setHandlerDept(name); |
|
|
|
itemHandleProcessService.insert(processEntity); |
|
|
|
|
|
|
|
// 删除已流转协助部门
|
|
|
|
itemDeptService.modifyItemDepts(deptId, id); |
|
|
|
// 新增流转协助部门
|
|
|
|
ItemDeptEntity deptEntity = new ItemDeptEntity(); |
|
|
|
deptEntity.setItemId(id); |
|
|
|
deptEntity.setDeptId(deptId); |
|
|
|
deptEntity.setDeptName(name); |
|
|
|
deptEntity.setCreatedDeptId(deptId); |
|
|
|
deptEntity.setItemHandleId(processEntity.getId()); |
|
|
|
itemDeptDao.insert(deptEntity); |
|
|
|
|
|
|
|
dto.setId(processEntity.getId()); |
|
|
|
pushToCityGridService.earlyInspectionApply(dto); |
|
|
|
@ -4743,6 +4763,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
handleProcessEntity.setHandleAdvice(handleAdvice); |
|
|
|
handleProcessEntity.setOutHandleAdvice(handleAdvice); |
|
|
|
handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue()); |
|
|
|
handleProcessEntity.setGridNextcantoncode("370203"); |
|
|
|
itemHandleProcessService.insert(handleProcessEntity); |
|
|
|
// 删除已流转协助部门
|
|
|
|
itemDeptService.modifyItemDepts(deptId, formDTO.getId()); |
|
|
|
@ -5152,6 +5173,24 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
dto.getId().toString(), JSONObject.toJSONString(body)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 图片检查 |
|
|
|
* |
|
|
|
* @param list |
|
|
|
* @return void |
|
|
|
* @author zhy |
|
|
|
* @date 2022/11/15 17:13 |
|
|
|
*/ |
|
|
|
private void imageCheck(List<String> list) { |
|
|
|
if (CollUtil.isNotEmpty(list)) { |
|
|
|
list.forEach(item -> { |
|
|
|
if (item.contains("wxfile://")) { |
|
|
|
throw new RenException("图片地址有误,请删除后重新上传"); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public class DataReport { |
|
|
|
public void myRun(ItemHandleProcessDTO dto, String type) { |
|
|
|
new Thread(new Runnable() { |
|
|
|
@ -5194,22 +5233,4 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 图片检查 |
|
|
|
* |
|
|
|
* @param list |
|
|
|
* @return void |
|
|
|
* @author zhy |
|
|
|
* @date 2022/11/15 17:13 |
|
|
|
*/ |
|
|
|
private void imageCheck(List<String> list) { |
|
|
|
if (CollUtil.isNotEmpty(list)) { |
|
|
|
list.forEach(item -> { |
|
|
|
if (item.contains("wxfile://")) { |
|
|
|
throw new RenException("图片地址有误,请删除后重新上传"); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|