diff --git a/src/main/java/com/cm/inspection/controller/apis/publicareareport/PublicAreaReportController.java b/src/main/java/com/cm/inspection/controller/apis/publicareareport/PublicAreaReportController.java index c7704c6..2b1163f 100644 --- a/src/main/java/com/cm/inspection/controller/apis/publicareareport/PublicAreaReportController.java +++ b/src/main/java/com/cm/inspection/controller/apis/publicareareport/PublicAreaReportController.java @@ -102,6 +102,22 @@ public class PublicAreaReportController extends AbstractController { return publicAreaReportService.listPagePublicAreaReport(page); } + @ApiOperation(value = "公共区域上报分页列表（我的）", notes = "公共区域上报分页列表（我的）接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpagepublicareareportofmine") + public SuccessResultList> listPagePublicAreaReportOfMine(ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return publicAreaReportService.listPagePublicAreaReportOfMine(page); + } + @ApiOperation(value = "当前用户id信息", notes = "当前用户id信息接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("getcurrentuseridinfo") diff --git a/src/main/java/com/cm/inspection/controller/apis/publicleaderhandle/PublicLeaderHandleController.java b/src/main/java/com/cm/inspection/controller/apis/publicleaderhandle/PublicLeaderHandleController.java index 3dd5c4d..838676a 100644 --- a/src/main/java/com/cm/inspection/controller/apis/publicleaderhandle/PublicLeaderHandleController.java +++ b/src/main/java/com/cm/inspection/controller/apis/publicleaderhandle/PublicLeaderHandleController.java @@ -103,6 +103,22 @@ public class PublicLeaderHandleController extends AbstractController { return publicLeaderHandleService.listPagePublicLeaderHandle(page); } + @ApiOperation(value = "公共领导处理分页列表（我的）", notes = "公共领导处理分页列表（我的）接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpagepublicleaderhandleofmine") + public SuccessResultList> listPagePublicLeaderHandleOfMine(ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return publicLeaderHandleService.listPagePublicLeaderHandleOfMine(page); + } + @ApiOperation(value = "公共领导处理统计", notes = "公共领导处理统计接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("countpublicleaderhandle") diff --git a/src/main/java/com/cm/inspection/controller/app/apis/publicareareport/PublicAreaReportAppController.java b/src/main/java/com/cm/inspection/controller/app/apis/publicareareport/PublicAreaReportAppController.java index 9f74e09..d7cc747 100644 --- a/src/main/java/com/cm/inspection/controller/app/apis/publicareareport/PublicAreaReportAppController.java +++ b/src/main/java/com/cm/inspection/controller/app/apis/publicareareport/PublicAreaReportAppController.java @@ -91,6 +91,23 @@ public class PublicAreaReportAppController extends AbstractController { return publicAreaReportService.listPublicAreaReport(params); } + @ApiOperation(value = "公共区域上报分页列表（我的）", notes = "公共区域上报分页列表（我的）接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpagepublicareareportofmine") + public SuccessResultList> listPagePublicAreaReportOfMine(@RequestHeader("token") String token, ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return publicAreaReportService.listPagePublicAreaReportOfMine(token, page); + } + @ApiOperation(value = "公共区域上报分页列表", notes = "公共区域上报分页列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "token", value = "token", paramType = "header"), diff --git a/src/main/java/com/cm/inspection/controller/app/apis/publicleaderhandle/PublicLeaderHandleAppController.java b/src/main/java/com/cm/inspection/controller/app/apis/publicleaderhandle/PublicLeaderHandleAppController.java index deea5ac..e5d9f81 100644 --- a/src/main/java/com/cm/inspection/controller/app/apis/publicleaderhandle/PublicLeaderHandleAppController.java +++ b/src/main/java/com/cm/inspection/controller/app/apis/publicleaderhandle/PublicLeaderHandleAppController.java @@ -109,6 +109,23 @@ public class PublicLeaderHandleAppController extends AbstractController { return publicLeaderHandleService.listPagePublicLeaderHandle(page); } + @ApiOperation(value = "公共领导处理分页列表（我的）", notes = "公共领导处理分页列表（我的）接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpagepublicleaderhandleofmine") + public SuccessResultList> listPagePublicLeaderHandleOfMine(@RequestHeader("token") String token, ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return publicLeaderHandleService.listPagePublicLeaderHandleOfMine(token, page); + } + @ApiOperation(value = "公共领导处理统计", notes = "公共领导处理统计接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("countpublicleaderhandle") diff --git a/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java index c8977b1..df1ff50 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/publicleaderhandle/PublicLeaderHandleDTO.java @@ -27,6 +27,18 @@ public class PublicLeaderHandleDTO { private String handleUserId; @ApiModelProperty(name = "handleUserName", value = "处理人") private String handleUserName; + @ApiModelProperty(name = "checkAddress", value = "检查地址") + private String checkAddress; + @ApiModelProperty(name = "checkDate", value = "检查时间") + private String checkDate; + @ApiModelProperty(name = "checkContent", value = "检查内容") + private String checkContent; + @ApiModelProperty(name = "checkPhotos", value = "检查图片") + private String checkPhotos; + @ApiModelProperty(name = "checkType", value = "检查类型") + private Integer checkType; + @ApiModelProperty(name = "checkUserName", value = "检查人") + private String checkUserName; public String getPublicLeaderHandleId() { return publicLeaderHandleId == null ? "" : publicLeaderHandleId; @@ -84,23 +96,83 @@ public class PublicLeaderHandleDTO { this.handleUserName = handleUserName; } + public String getCheckAddress() { + return checkAddress == null ? "" : checkAddress.trim(); + } + + public void setCheckAddress(String checkAddress) { + this.checkAddress = checkAddress; + } + + public String getCheckDate() { + return checkDate == null ? "" : checkDate.trim(); + } + + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; + } + + public String getCheckContent() { + return checkContent == null ? "" : checkContent.trim(); + } + + public void setCheckContent(String checkContent) { + this.checkContent = checkContent; + } + + public String getCheckPhotos() { + return checkPhotos == null ? "" : checkPhotos.trim(); + } + + public void setCheckPhotos(String checkPhotos) { + this.checkPhotos = checkPhotos; + } + + public Integer getCheckType() { + return checkType; + } + + public void setCheckType(Integer checkType) { + this.checkType = checkType; + } + + public String getCheckUserName() { + return checkUserName == null ? "" : checkUserName.trim(); + } + + public void setCheckUserName(String checkUserName) { + this.checkUserName = checkUserName; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("{"); - sb.append("\"publicLeaderHandleId\":\"") - .append(publicLeaderHandleId).append('\"'); - sb.append(",\"publicAreaReportId\":\"") - .append(publicAreaReportId).append('\"'); + sb.append("\"publicLeaderHandleId\":") + .append("\"").append(publicLeaderHandleId).append("\""); + sb.append(",\"publicAreaReportId\":") + .append("\"").append(publicAreaReportId).append("\""); sb.append(",\"handleStatus\":") .append(handleStatus); - sb.append(",\"handleSummary\":\"") - .append(handleSummary).append('\"'); - sb.append(",\"handlePhotos\":\"") - .append(handlePhotos).append('\"'); - sb.append(",\"handleUserId\":\"") - .append(handleUserId).append('\"'); - sb.append(",\"handleUserName\":\"") - .append(handleUserName).append('\"'); + sb.append(",\"handleSummary\":") + .append("\"").append(handleSummary).append("\""); + sb.append(",\"handlePhotos\":") + .append("\"").append(handlePhotos).append("\""); + sb.append(",\"handleUserId\":") + .append("\"").append(handleUserId).append("\""); + sb.append(",\"handleUserName\":") + .append("\"").append(handleUserName).append("\""); + sb.append(",\"checkAddress\":") + .append("\"").append(checkAddress).append("\""); + sb.append(",\"checkDate\":") + .append("\"").append(checkDate).append("\""); + sb.append(",\"checkContent\":") + .append("\"").append(checkContent).append("\""); + sb.append(",\"checkPhotos\":") + .append("\"").append(checkPhotos).append("\""); + sb.append(",\"checkType\":") + .append(checkType); + sb.append(",\"checkUserName\":") + .append("\"").append(checkUserName).append("\""); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java index 1c7c7c2..ea707d2 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/publiclog/PublicLogDTO.java @@ -25,6 +25,26 @@ public class PublicLogDTO { private String logUserName; @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; + @ApiModelProperty(name = "checkAddress", value = "检查地址") + private String checkAddress; + @ApiModelProperty(name = "checkDate", value = "检查时间") + private String checkDate; + @ApiModelProperty(name = "checkContent", value = "检查内容") + private String checkContent; + @ApiModelProperty(name = "checkPhotos", value = "检查图片") + private String checkPhotos; + @ApiModelProperty(name = "checkType", value = "检查类型") + private Integer checkType; + @ApiModelProperty(name = "handleStatus", value = "处理状态") + private Integer handleStatus; + @ApiModelProperty(name = "handleSummary", value = "处理说明") + private String handleSummary; + @ApiModelProperty(name = "handlePhotos", value = "处理图片") + private String handlePhotos; + @ApiModelProperty(name = "handleUserId", value = "处理人ID") + private String handleUserId; + @ApiModelProperty(name = "handleUserName", value = "处理人") + private String handleUserName; public String getPublicLogId() { return publicLogId == null ? "" : publicLogId; @@ -74,21 +94,121 @@ public class PublicLogDTO { this.gmtCreate = gmtCreate; } + public String getCheckAddress() { + return checkAddress == null ? "" : checkAddress.trim(); + } + + public void setCheckAddress(String checkAddress) { + this.checkAddress = checkAddress; + } + + public String getCheckDate() { + return checkDate == null ? "" : checkDate.trim(); + } + + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; + } + + public String getCheckContent() { + return checkContent == null ? "" : checkContent.trim(); + } + + public void setCheckContent(String checkContent) { + this.checkContent = checkContent; + } + + public String getCheckPhotos() { + return checkPhotos == null ? "" : checkPhotos.trim(); + } + + public void setCheckPhotos(String checkPhotos) { + this.checkPhotos = checkPhotos; + } + + public Integer getCheckType() { + return checkType; + } + + public void setCheckType(Integer checkType) { + this.checkType = checkType; + } + + public Integer getHandleStatus() { + return handleStatus; + } + + public void setHandleStatus(Integer handleStatus) { + this.handleStatus = handleStatus; + } + + public String getHandleSummary() { + return handleSummary == null ? "" : handleSummary.trim(); + } + + public void setHandleSummary(String handleSummary) { + this.handleSummary = handleSummary; + } + + public String getHandlePhotos() { + return handlePhotos == null ? "" : handlePhotos.trim(); + } + + public void setHandlePhotos(String handlePhotos) { + this.handlePhotos = handlePhotos; + } + + public String getHandleUserId() { + return handleUserId == null ? "" : handleUserId.trim(); + } + + public void setHandleUserId(String handleUserId) { + this.handleUserId = handleUserId; + } + + public String getHandleUserName() { + return handleUserName == null ? "" : handleUserName.trim(); + } + + public void setHandleUserName(String handleUserName) { + this.handleUserName = handleUserName; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("{"); - sb.append("\"publicLogId\":\"") - .append(publicLogId).append('\"'); - sb.append(",\"publicAreaReportId\":\"") - .append(publicAreaReportId).append('\"'); - sb.append(",\"publicLeaderHandleId\":\"") - .append(publicLeaderHandleId).append('\"'); - sb.append(",\"logSummary\":\"") - .append(logSummary).append('\"'); - sb.append(",\"logUserName\":\"") - .append(logUserName).append('\"'); - sb.append(",\"gmtCreate\":\"") - .append(gmtCreate).append('\"'); + sb.append("\"publicLogId\":") + .append("\"").append(publicLogId).append("\""); + sb.append(",\"publicAreaReportId\":") + .append("\"").append(publicAreaReportId).append("\""); + sb.append(",\"publicLeaderHandleId\":") + .append("\"").append(publicLeaderHandleId).append("\""); + sb.append(",\"logSummary\":") + .append("\"").append(logSummary).append("\""); + sb.append(",\"logUserName\":") + .append("\"").append(logUserName).append("\""); + sb.append(",\"gmtCreate\":") + .append("\"").append(gmtCreate).append("\""); + sb.append(",\"checkAddress\":") + .append("\"").append(checkAddress).append("\""); + sb.append(",\"checkDate\":") + .append("\"").append(checkDate).append("\""); + sb.append(",\"checkContent\":") + .append("\"").append(checkContent).append("\""); + sb.append(",\"checkPhotos\":") + .append("\"").append(checkPhotos).append("\""); + sb.append(",\"checkType\":") + .append(checkType); + sb.append(",\"handleStatus\":") + .append(handleStatus); + sb.append(",\"handleSummary\":") + .append("\"").append(handleSummary).append("\""); + sb.append(",\"handlePhotos\":") + .append("\"").append(handlePhotos).append("\""); + sb.append(",\"handleUserId\":") + .append("\"").append(handleUserId).append("\""); + sb.append(",\"handleUserName\":") + .append("\"").append(handleUserName).append("\""); sb.append('}'); return sb.toString(); } diff --git a/src/main/java/com/cm/inspection/service/publicareareport/IPublicAreaReportService.java b/src/main/java/com/cm/inspection/service/publicareareport/IPublicAreaReportService.java index 178826b..267e6f4 100644 --- a/src/main/java/com/cm/inspection/service/publicareareport/IPublicAreaReportService.java +++ b/src/main/java/com/cm/inspection/service/publicareareport/IPublicAreaReportService.java @@ -108,4 +108,22 @@ public interface IPublicAreaReportService { */ SuccessResultList> listPagePublicAreaReport(ListPage page) throws SearchException; + /** + * 公共区域上报分页列表（我的） + * + * @param page + * @return + * @throws SearchException + */ + SuccessResultList> listPagePublicAreaReportOfMine(ListPage page) throws SearchException; + + /** + * 公共区域上报分页列表（APP）（我的） + * + * @param token + * @param page + * @return + * @throws SearchException + */ + SuccessResultList> listPagePublicAreaReportOfMine(String token, ListPage page) throws SearchException; } diff --git a/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java b/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java index fba3b75..e4b3c5a 100644 --- a/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java @@ -196,4 +196,18 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA return new SuccessResultList<>(publicAreaReportDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPagePublicAreaReportOfMine(ListPage page) throws SearchException { + return listPagePublicAreaReportOfMine(null, page); + } + + @Override + public SuccessResultList> listPagePublicAreaReportOfMine(String token, ListPage page) throws SearchException { + if (StringUtils.isBlank(token)) { + page.getParams().put("creator", securityComponent.getCurrentUser().getUserId()); + } else { + page.getParams().put("creator", AppTokenManager.getInstance().getToken(token).getAppTokenUser().getId()); + } + return listPagePublicAreaReport(page); + } } diff --git a/src/main/java/com/cm/inspection/service/publicleaderhandle/IPublicLeaderHandleService.java b/src/main/java/com/cm/inspection/service/publicleaderhandle/IPublicLeaderHandleService.java index c56fe31..5ce6c3c 100644 --- a/src/main/java/com/cm/inspection/service/publicleaderhandle/IPublicLeaderHandleService.java +++ b/src/main/java/com/cm/inspection/service/publicleaderhandle/IPublicLeaderHandleService.java @@ -153,4 +153,22 @@ public interface IPublicLeaderHandleService { */ SuccessResultData countPublicLeaderHandle(Map params) throws SearchException; + /** + * 公共领导处理分页列表（我的） + * + * @param page + * @return + * @throws SearchException + */ + SuccessResultList> listPagePublicLeaderHandleOfMine(ListPage page) throws SearchException; + + /** + * 公共领导处理分页列表（APP）（我的） + * + * @param token + * @param page + * @return + * @throws SearchException + */ + SuccessResultList> listPagePublicLeaderHandleOfMine(String token, ListPage page) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java b/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java index 4de596d..845c260 100644 --- a/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/publicleaderhandle/impl/PublicLeaderHandleServiceImpl.java @@ -7,15 +7,20 @@ import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; +import com.cm.common.token.app.AppTokenManager; import com.cm.common.utils.HashMapUtil; import com.cm.common.utils.UUIDUtil; import com.cm.inspection.dao.publicleaderhandle.IPublicLeaderHandleDao; +import com.cm.inspection.pojo.dtos.gridpersonnel.GridPersonnelDTO; import com.cm.inspection.pojo.dtos.publicleaderhandle.PublicLeaderHandleDTO; import com.cm.inspection.pojo.vos.publicleaderhandle.PublicLeaderHandleVO; import com.cm.inspection.service.BaseService; +import com.cm.inspection.service.gridpersonnel.IGridPersonnelService; import com.cm.inspection.service.publicleaderhandle.IPublicLeaderHandleService; +import com.cm.inspection.service.publiclog.IPublicLogService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,6 +38,10 @@ public class PublicLeaderHandleServiceImpl extends BaseService implements IPubli @Autowired private IPublicLeaderHandleDao publicLeaderHandleDao; + @Autowired + private IPublicLogService publicLogService; + @Autowired + private IGridPersonnelService gridPersonnelService; @Override public SuccessResult savePublicLeaderHandle(PublicLeaderHandleVO publicLeaderHandleVO) throws Exception { @@ -144,6 +153,7 @@ public class PublicLeaderHandleServiceImpl extends BaseService implements IPubli * @param publicLeaderHandleVO */ private void updatePublicLeaderHandleInfo(String token, String publicLeaderHandleId, PublicLeaderHandleVO publicLeaderHandleVO) throws Exception { + String userName = getUserName(token); Map params = HashMapUtil.beanToMap(publicLeaderHandleVO); params.put("publicLeaderHandleId", publicLeaderHandleId); if (token != null) { @@ -152,6 +162,57 @@ public class PublicLeaderHandleServiceImpl extends BaseService implements IPubli setUpdateInfo(params); } publicLeaderHandleDao.updatePublicLeaderHandle(params); + // 处理日志 + if (publicLeaderHandleVO.getHandleStatus() == 1) { + LOG.debug("处理成功"); + publicLogService.savePublicLogSimple(token, publicLeaderHandleVO.getPublicAreaReportId(), publicLeaderHandleId, "处理成功", userName); + } else if (publicLeaderHandleVO.getHandleStatus() == 2) { + LOG.debug("处理失败，上报领导"); + publicLogService.savePublicLogSimple(token, publicLeaderHandleVO.getPublicAreaReportId(), publicLeaderHandleId, "处理失败，上报上级处理", userName); + // 领导处理 + GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getLeader(params.get("creator").toString(), 0); + if (gridPersonnelDTO == null) { + throw new SaveException("非处理人，上报失败"); + } + String leaderUserId = gridPersonnelDTO.getLeaderUserId(); + if (StringUtils.isBlank(leaderUserId)) { + LOG.debug("上级领导为空，自己继续处理"); + leaderUserId = gridPersonnelDTO.getUserId(); + } + String[] leaderUserIdArray = leaderUserId.split("\\|"); + saveLeaderHandle(token, publicLeaderHandleVO.getPublicAreaReportId(), leaderUserIdArray[0], leaderUserIdArray[2]); + } + } + + /** + * 保存上级领导处理结果 + * + * @param token + * @param publicAreaReportId + * @param handleUserId + * @param handleUserName + * @throws Exception + */ + private void saveLeaderHandle(String token, String publicAreaReportId, String handleUserId, String handleUserName) throws Exception { + PublicLeaderHandleVO publicLeaderHandleVO = new PublicLeaderHandleVO(); + publicLeaderHandleVO.setPublicAreaReportId(publicAreaReportId); + publicLeaderHandleVO.setHandleUserId(handleUserId); + publicLeaderHandleVO.setHandleUserName(handleUserName); + String publicLeaderHandleId = savePublicLeaderHandleByTokenReturnId(token, publicLeaderHandleVO); + publicLogService.savePublicLogSimple(token, publicLeaderHandleVO.getPublicAreaReportId(), publicLeaderHandleId, "等待处理", handleUserId); + } + + /** + * 获取用户名 + * + * @param token + * @return + */ + private String getUserName(String token) { + if (StringUtils.isBlank(token)) { + return securityComponent.getCurrentUser().getUserName(); + } + return AppTokenManager.getInstance().getToken(token).getAppTokenUser().getId(); } @Override @@ -185,4 +246,18 @@ public class PublicLeaderHandleServiceImpl extends BaseService implements IPubli return new SuccessResultData<>(countNumberPublicLeaderHandle(params)); } + @Override + public SuccessResultList> listPagePublicLeaderHandleOfMine(ListPage page) throws SearchException { + return listPagePublicLeaderHandleOfMine(null, page); + } + + @Override + public SuccessResultList> listPagePublicLeaderHandleOfMine(String token, ListPage page) throws SearchException { + if (StringUtils.isBlank(token)) { + page.getParams().put("userId", securityComponent.getCurrentUser().getUserId()); + } else { + page.getParams().put("userId", AppTokenManager.getInstance().getToken(token).getAppTokenUser().getId()); + } + return listPagePublicLeaderHandle(page); + } } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml b/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml index 97c2627..807650b 100644 --- a/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml +++ b/src/main/resources/mybatis/mapper/publicareareport/publicareareport-mapper.xml @@ -154,6 +154,10 @@ #{publicAreaReportIds[${index}]} + + AND + t1.creator = #{creator} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/publicleaderhandle/publicleaderhandle-mapper.xml b/src/main/resources/mybatis/mapper/publicleaderhandle/publicleaderhandle-mapper.xml index 0021334..5480ebf 100644 --- a/src/main/resources/mybatis/mapper/publicleaderhandle/publicleaderhandle-mapper.xml +++ b/src/main/resources/mybatis/mapper/publicleaderhandle/publicleaderhandle-mapper.xml @@ -10,6 +10,12 @@ + + + + + + @@ -105,9 +111,21 @@ t1.handle_status, t1.handle_summary, t1.handle_photos, + jt1.check_address, + jt1.check_date, + jt1.check_content, + jt1.check_photos, + jt1.check_type, + jt1.check_user_name, t1.public_leader_handle_id FROM gen_public_leader_handle t1 + INNER JOIN + gen_public_area_report jt1 + ON + t1.public_area_report_id = jt1.public_area_report_id + AND + jt1.is_delete = 0 WHERE t1.is_delete = 0 @@ -125,14 +143,28 @@ t1.handle_photos, t1.handle_user_id, t1.handle_user_name, + jt1.check_address, + jt1.check_date, + jt1.check_content, + jt1.check_photos, + jt1.check_type, + jt1.check_user_name, t1.public_leader_handle_id FROM gen_public_leader_handle t1 + INNER JOIN + gen_public_area_report jt1 + ON + t1.public_area_report_id = jt1.public_area_report_id + AND + jt1.is_delete = 0 WHERE t1.is_delete = 0 AND ( - t1.handle_user_name LIKE CONCAT('%', #{keywords}, '%') + t1.handle_summary LIKE CONCAT('%', #{keywords}, '%') + OR + jt1.check_content LIKE CONCAT('%', #{keywords}, '%') ) @@ -150,6 +182,10 @@ #{publicLeaderHandleIds[${index}]} + + AND + t1.handle_user_id = #{userId} + diff --git a/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml b/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml index 84a4ac5..94515c8 100644 --- a/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml +++ b/src/main/resources/mybatis/mapper/publiclog/publiclog-mapper.xml @@ -9,6 +9,16 @@ + + + + + + + + + + @@ -112,10 +122,32 @@ t1.public_leader_handle_id, t1.log_summary, t1.log_user_name, - LEFT(gmt_create, 19) gmt_create, - t1.public_log_id + LEFT(t1.gmt_create, 19) gmt_create, + t1.public_log_id, + jt1.check_address, + jt1.check_date, + jt1.check_content, + jt1.check_photos, + jt1.check_type, + jt2.handle_status, + jt2.handle_summary, + jt2.handle_photos, + jt2.handle_user_id, + jt2.handle_user_name FROM gen_public_log t1 + LEFT JOIN + gen_public_area_report jt1 + ON + t1.public_area_report_id = jt1.public_area_report_id + AND + jt1.is_delete = 0 + LEFT JOIN + gen_public_leader_handle jt2 + ON + t1.public_leader_handle_id = jt2.public_leader_handle_id + AND + jt2.is_delete = 0 WHERE t1.is_delete = 0 diff --git a/src/main/resources/static/route/publicareareport/list-publicareareport.html b/src/main/resources/static/route/publicareareport/list-publicareareport.html index 526a56e..ba4882f 100644 --- a/src/main/resources/static/route/publicareareport/list-publicareareport.html +++ b/src/main/resources/static/route/publicareareport/list-publicareareport.html @@ -154,6 +154,11 @@ return rowData; } }, + {field: 'log', width: 120, title: '日志', align:'center', + templet: function(row) { + return '' + } + }, ]], page: true, parseData: function(data) { @@ -280,6 +285,19 @@ } } }); + table.on('tool(dataTable)', function(obj) { + var data = obj.data; + var layEvent = obj.event; + if(layEvent === 'logEvent') { + top.dialog.open({ + url: top.restAjax.path('route/publiclog/get-publiclog.html?publicAreaReportId={publicAreaReportId}', [data.publicAreaReportId]), + title: '日志', + width: '500px', + height: '400px', + onClose: function() {} + }); + } + }); }); diff --git a/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle-mine.html b/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle-mine.html new file mode 100644 index 0000000..0031492 --- /dev/null +++ b/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle-mine.html @@ -0,0 +1,299 @@ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle.html b/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle.html index d99a2ca..d1bdc9f 100644 --- a/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle.html +++ b/src/main/resources/static/route/publicleaderhandle/list-publicleaderhandle.html @@ -104,6 +104,8 @@ return '待处理'; } else if(rowData == 1) { return '处理成功'; + } else if(rowData == 2) { + return '处理失败'; } return '无'; } @@ -143,6 +145,19 @@ return rowData; } }, + {field: 'operation', width: 100, title: '操作', align:'center', + templet: function(row) { + if(row.handleStatus == 0) { + return '' + } + return '-'; + } + }, + {field: 'log', width: 120, title: '日志', align:'center', + templet: function(row) { + return '' + } + }, ]], page: true, parseData: function(data) { @@ -269,6 +284,29 @@ } } }); + table.on('tool(dataTable)', function(obj) { + var data = obj.data; + var layEvent = obj.event; + if(layEvent === 'handleEvent') { + top.dialog.open({ + url: top.restAjax.path('route/publicleaderhandle/update-publicleaderhandle.html?publicLeaderHandleId={publicLeaderHandleId}', [data.publicLeaderHandleId]), + title: '处理', + width: '600px', + height: '400px', + onClose: function() { + reloadTable(); + } + }); + } else if(layEvent === 'logEvent') { + top.dialog.open({ + url: top.restAjax.path('route/publiclog/get-publiclog.html?publicAreaReportId={publicAreaReportId}', [data.publicAreaReportId]), + title: '处理', + width: '500px', + height: '400px', + onClose: function() {} + }); + } + }); }); diff --git a/src/main/resources/static/route/publicleaderhandle/update-publicleaderhandle.html b/src/main/resources/static/route/publicleaderhandle/update-publicleaderhandle.html index f876100..17b0c88 100644 --- a/src/main/resources/static/route/publicleaderhandle/update-publicleaderhandle.html +++ b/src/main/resources/static/route/publicleaderhandle/update-publicleaderhandle.html @@ -12,32 +12,67 @@ -
+
-
- - 上级列表/ - 编辑内容 - -
-
- -
- + +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
-
+
+ +
+ +
+
+
+ +
+ +
+ +
+
+
以下是处理结果
+
- + +
-
+
- +
@@ -73,8 +108,8 @@
- - + +
@@ -82,8 +117,6 @@
- - +
+
+
+ + + + \ No newline at end of file