|
|
|
@ -102,6 +102,7 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.logging.log4j.LogManager; |
|
|
|
import org.apache.logging.log4j.Logger; |
|
|
|
import org.joda.time.DateTime; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
@ -110,6 +111,7 @@ import org.springframework.web.bind.annotation.RequestParam; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@ -654,6 +656,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
sqdjr.setSsjg(name); |
|
|
|
sqdjr.setSsjgbm(code); |
|
|
|
data.setSqdjr(sqdjr); |
|
|
|
data.setSqbm(entity.getSerialNum()); |
|
|
|
List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId()); |
|
|
|
log.info("执法照片imageList：" + imageList); |
|
|
|
//诉求照片
|
|
|
|
@ -1311,7 +1314,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
List<ItemHandleProgressResultDTO> list = baseDao.selectListOfItemHandleProgressByMobile(itemId); |
|
|
|
// 处理多次拼接处理人信息问题
|
|
|
|
for (ItemHandleProgressResultDTO dto : list) { |
|
|
|
String advice = dto.getAdvice(); |
|
|
|
String advice = dto.getAdvice() == null ? "" : dto.getAdvice(); |
|
|
|
// 对包含【h_s】的数据进行重新组装
|
|
|
|
if (advice.contains("h_s") && advice.contains(" 办理人：")) { |
|
|
|
String hsStr = advice.substring(advice.indexOf("h_s")); |
|
|
|
@ -1750,23 +1753,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
return resultDto; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param id 项目表主键 |
|
|
|
* @return boolean |
|
|
|
* @Author yinzuomei |
|
|
|
* @Description 校验项目是否已经上报网格化平台 |
|
|
|
* @Date 2019/12/27 10:52 |
|
|
|
**/ |
|
|
|
private boolean checkReport(String id) { |
|
|
|
QueryWrapper<ItemGridPlatformEntity> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq("REFERENCE_ID", id); |
|
|
|
List<ItemGridPlatformEntity> list = itemGridPlatformDao.selectList(wrapper); |
|
|
|
if (list != null && list.size() > 0) { |
|
|
|
return true; |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
private ItemGridPlatformEntity getReport(String id) { |
|
|
|
return itemGridPlatformDao.getOneOfGridPlatformItemByReferenceId(id); |
|
|
|
} |
|
|
|
@ -3306,7 +3292,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
code = dtoResult.getData().getDisCenterZoningCode(); |
|
|
|
name = dtoResult.getData().getName(); |
|
|
|
} |
|
|
|
|
|
|
|
data.setSqbm(entity.getSerialNum()); |
|
|
|
data.setSqssjg(code); |
|
|
|
data.setSqssjgmc(name); |
|
|
|
//组装企业数据
|
|
|
|
@ -3920,6 +3906,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
@Override |
|
|
|
public PageData<ItemStatisListPageResultDTO> getItemStatisListPage(@RequestParam Map<String, Object> params) { |
|
|
|
IPage<ItemStatisListPageResultDTO> page = getPage(params); |
|
|
|
if (params.isEmpty() || (!params.containsKey("startTime") && !params.containsKey("endTime") && !params.containsKey("statMonth") && !params.containsKey("statYear"))) { |
|
|
|
DateTime dateTime = new DateTime(new Date()); |
|
|
|
Date d = dateTime.plusDays(-1).toDate(); |
|
|
|
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
params.put("statDate", df.format(d)); |
|
|
|
} |
|
|
|
List<ItemStatisListPageResultDTO> list = baseDao.getItemStatisListPage(params); |
|
|
|
return new PageData<>(list, page.getTotal()); |
|
|
|
|
|
|
|
@ -4005,17 +3997,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
List<String> updateList = new ArrayList<String>(); |
|
|
|
String returnMsgBody = ""; |
|
|
|
List<AcceptItemDifficultyFormDTO> itemList = formDto.getItemList(); |
|
|
|
for(int i = 0 ; i < itemList.size() ; i++){ |
|
|
|
for (int i = 0; i < itemList.size(); i++) { |
|
|
|
AcceptItemDifficultyFormDTO acceptItemDifficultyFormDTO = itemList.get(i); |
|
|
|
if("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())){ |
|
|
|
if ("1".equals(acceptItemDifficultyFormDTO.getIsDifficulty())) { |
|
|
|
updateList.add(acceptItemDifficultyFormDTO.getSerialNum()); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
if(updateList.size() > 0){ |
|
|
|
if (updateList.size() > 0) { |
|
|
|
try { |
|
|
|
baseDao.updateBatchBySerialNum(updateList); |
|
|
|
}catch (Exception e){ |
|
|
|
} catch (Exception e) { |
|
|
|
logger.info(e); |
|
|
|
// 保存接口调用日志
|
|
|
|
this.saveInterfaceLog("", InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(), |
|
|
|
@ -4031,5 +4023,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
return new Result().ok("操作成功"); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据经纬度查询部门下附近项目数据 |
|
|
|
* |
|
|
|
* @param params |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<ItemListByAddressResultDTO> getItemListByAddress(Map<String, Object> params) { |
|
|
|
return baseDao.getItemListByAddress(params); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
wanggongfeng
3 years ago