src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -1,7 +1,9 @@ package org.springblade.modules.article.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +19,9 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @author zhongrj @@ -114,11 +118,11 @@ objectUpdateWrapper.setSql("view_number = view_number + 1"); objectUpdateWrapper.eq("id", article.getId()); articleService.update(null, objectUpdateWrapper); // List<List<String>> lists = new ArrayList<>(); // if (StringUtils.isNotBlank(detail.getArticleRange())) { // lists = (List<List<String>>) JSON.parse(detail.getArticleRange()); // } // detail.setArticleList(lists); List<List<String>> lists = new ArrayList<>(); if (StringUtils.isNotBlank(detail.getArticleRange())) { lists = (List<List<String>>) JSON.parse(detail.getArticleRange()); } detail.setArticleList(lists); return R.data(detail); }
@@ -69,7 +69,7 @@ private Integer eventType; private List<String> articleList; private List<List<String>> articleList; private String houseCode; src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -20,15 +20,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; import org.springframework.format.annotation.DateTimeFormat; /** * 场所详情表 实体类 @@ -103,7 +101,7 @@ /** * 确认标记 1：待审核 2：审核通过 3：审核不通过 */ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过") @ApiModelProperty(value = "确认标记 0:待完善 1：待审核 2：审核通过 3：审核不通过") private Integer confirmFlag; /** * 确认意见 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -17,7 +17,7 @@ package org.springblade.modules.place.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.logging.log4j.util.Strings; import org.springblade.common.node.TreeStringNode; @@ -31,25 +31,30 @@ import org.springblade.modules.grid.service.IGridService; import org.springblade.modules.grid.service.IGridmanService; import org.springblade.modules.grid.vo.GridVO; import org.springblade.modules.place.entity.*; import org.springblade.modules.place.entity.PlaceEntity; import org.springblade.modules.place.entity.PlaceExtEntity; import org.springblade.modules.place.entity.PlacePoiLabel; import org.springblade.modules.place.entity.PlaceRelEntity; import org.springblade.modules.place.excel.PlaceAndRelExcel; import org.springblade.modules.place.excel.PlaceExcel; import org.springblade.modules.place.mapper.PlaceMapper; import org.springblade.modules.place.service.IPlaceExtService; import org.springblade.modules.place.service.IPlacePoiLabelService; import org.springblade.modules.place.service.IPlaceRelService; import org.springblade.modules.place.vo.PlaceVO; import org.springblade.modules.place.mapper.PlaceMapper; import org.springblade.modules.place.service.IPlaceService; import org.springblade.modules.place.vo.PlaceVO; import org.springblade.modules.system.entity.Dept; import org.springblade.modules.system.entity.User; import org.springblade.modules.system.service.IDeptService; import org.springblade.modules.system.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; /** * 场所表 服务实现类 @@ -389,6 +394,8 @@ if (null == one) { placeExtEntity.setPlaceId(placeVO.getId()); placeExtEntity.setLocation(placeVO.getLocation()); // TODO 后面需要把新增的参所设置为待完善 // placeExtEntity.setConfirmFlag(0); //新增 placeExtService.savePlaceExt(placeExtEntity); } src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -121,10 +121,10 @@ return R.status(taskService.deleteLogic(Func.toLongList(ids))); } @PostMapping("/countNumber") @GetMapping("/countNumber") @ApiOperationSupport(order = 8) @ApiOperation(value = "统计用户标签报事数量") public R countNumber(@RequestParam(value = "houseCode",required = false) String houseCode, @RequestParam(value = "status",required = false) Integer status) { public R countNumber(@RequestParam(value = "houseCode", required = false) String houseCode, @RequestParam(value = "status", required = false) Integer status) { return R.data(taskService.countNumber(houseCode, status)); }
@@ -180,6 +180,9 @@ <if test="vo.status != null"> AND jtrfr.status = #{vo.status} </if> <if test="vo.addressCode != null"> AND jtrfr.address_code = #{vo.addressCode} </if> <if test="vo.viewType != null"> AND jtrfr.view_type = #{vo.viewType} </if> src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -16,8 +16,9 @@ */ package org.springblade.modules.task.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.commons.lang3.StringUtils; import org.springblade.common.utils.SpringUtils; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; @@ -81,7 +82,7 @@ * @return */ @Override public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode,Integer reportType) { public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode, Integer reportType) { TaskEntity taskEntity = new TaskEntity(); taskEntity.setType(type); taskEntity.setName(name); @@ -113,14 +114,17 @@ public Object countNumber(String houseCode, Integer status) { Map<String, Object> objectObjectHashMap = new HashMap<>(); // 总数 Long all = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery() .eq(TaskEntity::getCreateUser, AuthUtil.getUserId()) .in(TaskEntity::getReportType,2,3,4,5,6)); LambdaQueryWrapper<TaskEntity> objectQueryWrapper = new LambdaQueryWrapper<>(); objectQueryWrapper.eq(TaskEntity::getCreateUser, AuthUtil.getUserId()); objectQueryWrapper.isNotNull(TaskEntity::getHouseCode); objectQueryWrapper.in(TaskEntity::getReportType, 2, 3, 4, 5, 6); if (StringUtils.isNotBlank(houseCode)) { objectQueryWrapper.eq(TaskEntity::getHouseCode, houseCode); } Long all = baseMapper.selectCount(objectQueryWrapper); objectQueryWrapper.eq(TaskEntity::getStatus, 2); // 已处理 Long processed = baseMapper.selectCount(Wrappers.<TaskEntity>lambdaQuery() .eq(TaskEntity::getCreateUser, AuthUtil.getUserId()) .eq(TaskEntity::getStatus, 2) .in(TaskEntity::getReportType,2,3,4,5,6)); Long processed = baseMapper.selectCount(objectQueryWrapper); objectObjectHashMap.put("all", all); objectObjectHashMap.put("processed", processed); return objectObjectHashMap; @@ -168,7 +172,7 @@ taskVO.setStatus(1); Integer disposable = baseMapper.selectTaskCount(taskVO); taskVO.setFrequency(2); Integer periodicity = baseMapper.selectTaskCount(taskVO); Integer periodicity = baseMapper.selectTaskCount(taskVO); objectObjectHashMap.put("disposable", disposable); objectObjectHashMap.put("periodicity", periodicity); return objectObjectHashMap;
