diff --git a/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java b/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java index af1019b..01a55ef 100644 --- a/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java +++ b/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java @@ -14,6 +14,7 @@ import com.cm.common.result.SuccessResultList; import com.cm.inspection.enums.GridPersonnelTypeEnum; import com.cm.inspection.pojo.dtos.check.Check2DTO; import com.cm.inspection.pojo.dtos.check.Check2LogDTO; +import com.cm.inspection.pojo.dtos.check.CheckSimpleWithEnterpriseDTO; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import com.cm.inspection.pojo.vos.check.CheckCompleteVO; @@ -62,7 +63,7 @@ public class Check2Controller extends AbstractController { }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("get/{checkId}") - public Check2DTO getCheckById(@PathVariable("checkId") String checkId) throws SearchException { + public Check2DTO get(@PathVariable("checkId") String checkId) throws SearchException { return check2Service.get(checkId); } @@ -310,9 +311,31 @@ public class Check2Controller extends AbstractController { return new SuccessResult(); } + @ApiOperation(value = "检查日志列表", notes = "检查日志列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list-check-log/{checkId}") public List listCheckLog(@PathVariable("checkId") String checkId) { return check2Service.listCheckLog(checkId); } + @ApiOperation(value = "我的历史列表", notes = "我的历史接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage-history-of-mine") + public SuccessResultList> listPageHistoryOfMine(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return check2Service.listPageHistoryOfMine(page); + } + + @ApiOperation(value = "检查表列表（简单格式和企业信息）", notes = "检查表列表（简单格式和企业信息）接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-simple-with-enterprise") + public List listSimpleWithEnterprise() { + Map params = requestParams(); + return check2Service.listSimpleWithEnterprise(params); + } + } \ No newline at end of file diff --git a/src/main/java/com/cm/inspection/controller/app/apis/check/CheckApp2Controller.java b/src/main/java/com/cm/inspection/controller/app/apis/check/CheckApp2Controller.java index 0df7b49..d0143cd 100644 --- a/src/main/java/com/cm/inspection/controller/app/apis/check/CheckApp2Controller.java +++ b/src/main/java/com/cm/inspection/controller/app/apis/check/CheckApp2Controller.java @@ -4,15 +4,21 @@ import com.cm.common.annotation.CheckRequestBodyAnnotation; import com.cm.common.base.AbstractController; import com.cm.common.constants.ISystemConstant; import com.cm.common.exception.ParamsException; +import com.cm.common.exception.SearchException; import com.cm.common.pojo.ListPage; import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResult; import com.cm.common.result.SuccessResultList; import com.cm.inspection.enums.CheckTypeEnum; +import com.cm.inspection.enums.GridPersonnelTypeEnum; import com.cm.inspection.pojo.dtos.check.Check2DTO; +import com.cm.inspection.pojo.dtos.check.Check2LogDTO; import com.cm.inspection.pojo.vos.check.Check2VO; +import com.cm.inspection.pojo.vos.check.CheckCompleteVO; +import com.cm.inspection.pojo.vos.check.StreetToLeaderVO; import com.cm.inspection.service.check.ICheck2Service; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,13 +32,13 @@ import java.util.Map; * @Date: 2020-03-25 22:59 * @Version: 1.0 **/ -@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "检查表接口") +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "检查表2接口") @RestController @RequestMapping(ISystemConstant.APP_PREFIX + "/check2") public class CheckApp2Controller extends AbstractController { @Autowired - private ICheck2Service checkService; + private ICheck2Service check2Service; @ApiOperation(value = "新增检查", notes = "新增检查接口") @ApiImplicitParams({ @@ -46,7 +52,7 @@ public class CheckApp2Controller extends AbstractController { throw new ParamsException("检查项列表为空"); } check2VO.setCheckType(CheckTypeEnum.CHECK.getValue()); - checkService.save(token, check2VO); + check2Service.save(token, check2VO); return new SuccessResult(); } @@ -62,7 +68,7 @@ public class CheckApp2Controller extends AbstractController { @PathVariable("checkId") String checkId, @RequestBody Check2VO check2VO) throws Exception { check2VO.setCheckType(CheckTypeEnum.RE_CHECK.getValue()); - checkService.saveRe(token, checkId, check2VO); + check2Service.saveRe(token, checkId, check2VO); return new SuccessResult(); } @@ -75,7 +81,224 @@ public class CheckApp2Controller extends AbstractController { public SuccessResultList> listPageReCheckOfMine(@RequestHeader("token") String token, ListPage page) { Map params = requestParams(); page.setParams(params); - return checkService.listPageReCheckOfMine(token, page); + return check2Service.listPageReCheckOfMine(token, page); + } + + @ApiOperation(value = "我的街道案件列表", notes = "我的街道案件列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage-street-of-mine") + public SuccessResultList> listPageStreetOfMine(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return check2Service.listPageStreetOfMine(token, page); + } + + @ApiOperation(value = "街道案件完成", notes = "街道案件完成接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-street-complete/{checkId}") + public SuccessResult updateStreetComplete(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateStreetComplete(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "街道案件上报领导", notes = "街道案件上报领导接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-street-to-leader/{checkId}") + @CheckRequestBodyAnnotation + public SuccessResult updateStreetToLeader(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody StreetToLeaderVO streetToLeaderVO) { + if (StringUtils.equals(GridPersonnelTypeEnum.DISTRICT.getValue(), streetToLeaderVO.getLeaderType())) { + if (StringUtils.isBlank(streetToLeaderVO.getLeaderId())) { + throw new ParamsException("领导不能为空"); + } + } + check2Service.updateStreetToLeader(token, checkId, streetToLeaderVO); + return new SuccessResult(); + } + + @ApiOperation(value = "我的旗县区委办局案件列表", notes = "我的旗县区委办局案件列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage-district-department-of-mine") + public SuccessResultList> listPageDistrictDepartmentOfMine(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return check2Service.listPageDistrictDepartmentOfMine(token, page); + } + + @ApiOperation(value = "旗县区委办局案件完成", notes = "旗县区委办局案件完成接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-district-department-complete/{checkId}") + public SuccessResult updateDistrictDepartmentComplete(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateDistrictDepartmentComplete(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "旗县区委办局案件回退", notes = "旗县区委办局案件回退接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-district-department-back/{checkId}") + public SuccessResult updateDistrictDepartmentBack(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateDistrictDepartmentBack(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "我的旗县区案件列表", notes = "我的旗县区案件列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage-district-of-mine") + public SuccessResultList> listPageDistrictOfMine(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return check2Service.listPageDistrictOfMine(token, page); + } + + @ApiOperation(value = "旗县区案件完成", notes = "旗县区案件完成接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-district-complete/{checkId}") + public SuccessResult updateDistrictComplete(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateDistrictComplete(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "旗县区案件回退", notes = "旗县区案件回退接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-district-back/{checkId}") + public SuccessResult updateDistrictBack(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateDistrictBack(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "旗县区案件上报领导", notes = "旗县区案件上报领导接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-district-to-leader/{checkId}") + @CheckRequestBodyAnnotation + public SuccessResult updateDistrictToLeader(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateDistrictToLeader(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "我的市案件列表", notes = "我的市案件列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage-city-of-mine") + public SuccessResultList> listPageCityOfMine(@RequestHeader("token") String token, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return check2Service.listPageCityOfMine(token, page); + } + + @ApiOperation(value = "市案件完成", notes = "市案件完成接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-city-complete/{checkId}") + public SuccessResult updateCityComplete(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateCityComplete(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "市案件回退", notes = "市案件回退接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-city-back/{checkId}") + public SuccessResult updateCityBack(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId, + @RequestBody CheckCompleteVO checkCompleteVO) { + check2Service.updateCityBack(token, checkId, checkCompleteVO); + return new SuccessResult(); + } + + @ApiOperation(value = "检查日志列表", notes = "检查日志列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查ID", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-check-log/{checkId}") + public List listCheckLog(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId) { + return check2Service.listCheckLog(checkId); + } + + @ApiOperation(value = "检查表详情(通过ID)", notes = "检查表详情(通过ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "checkId", value = "检查表ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{checkId}") + public Check2DTO get(@RequestHeader("token") String token, + @PathVariable("checkId") String checkId) throws SearchException { + return check2Service.get(checkId); } } \ No newline at end of file diff --git a/src/main/java/com/cm/inspection/controller/app/apis/gridpersonnel/GridPersonnelAppController.java b/src/main/java/com/cm/inspection/controller/app/apis/gridpersonnel/GridPersonnelAppController.java index 8faed1d..3bf824e 100644 --- a/src/main/java/com/cm/inspection/controller/app/apis/gridpersonnel/GridPersonnelAppController.java +++ b/src/main/java/com/cm/inspection/controller/app/apis/gridpersonnel/GridPersonnelAppController.java @@ -75,8 +75,8 @@ public class GridPersonnelAppController extends AbstractController { @ApiImplicitParam(name = "gridPersonnelId", value = "网格人员ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("getgridpersonnelbyid/{gridPersonnelId}") - public GridPersonnelDTO getGridPersonnelById(@RequestHeader("token") String token, @PathVariable("gridPersonnelId") String gridPersonnelId) throws SearchException { + @GetMapping("get/{gridPersonnelId}") + public GridPersonnelDTO get(@RequestHeader("token") String token, @PathVariable("gridPersonnelId") String gridPersonnelId) throws SearchException { return gridPersonnelService.get(gridPersonnelId); } @@ -85,8 +85,8 @@ public class GridPersonnelAppController extends AbstractController { @ApiImplicitParam(name = "token", value = "token", paramType = "header") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listgridpersonnel") - public List listGridPersonnel(@RequestHeader("token") String token) throws SearchException { + @GetMapping("list") + public List list(@RequestHeader("token") String token) throws SearchException { Map params = requestParams(); return gridPersonnelService.list(params); } @@ -101,8 +101,8 @@ public class GridPersonnelAppController extends AbstractController { @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("listpagegridpersonnel") - public SuccessResultList> listPageGridPersonnel(@RequestHeader("token") String token, ListPage page) throws SearchException, UnsupportedEncodingException { + @GetMapping("listpage") + public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) throws SearchException, UnsupportedEncodingException { Map params = requestParams(); page.setParams(params); return gridPersonnelService.listPage(page); diff --git a/src/main/java/com/cm/inspection/dao/check/ICheck2Dao.java b/src/main/java/com/cm/inspection/dao/check/ICheck2Dao.java index 0cb138b..0aa5bdf 100644 --- a/src/main/java/com/cm/inspection/dao/check/ICheck2Dao.java +++ b/src/main/java/com/cm/inspection/dao/check/ICheck2Dao.java @@ -5,7 +5,6 @@ import com.cm.common.exception.SaveException; import com.cm.common.exception.SearchException; import com.cm.common.exception.UpdateException; import com.cm.inspection.pojo.dtos.check.Check2DTO; -import com.cm.inspection.pojo.dtos.check.CheckDTO; import com.cm.inspection.pojo.dtos.check.CheckSimpleWithEnterpriseDTO; import org.springframework.stereotype.Repository; @@ -98,5 +97,5 @@ public interface ICheck2Dao { * @return * @throws SearchException */ - List listCheckSimpleWithEnterprise(Map params) throws SearchException; + List listSimpleWithEnterprise(Map params) throws SearchException; } diff --git a/src/main/java/com/cm/inspection/service/BaseService.java b/src/main/java/com/cm/inspection/service/BaseService.java index fdce8c2..16ac1ef 100644 --- a/src/main/java/com/cm/inspection/service/BaseService.java +++ b/src/main/java/com/cm/inspection/service/BaseService.java @@ -1,7 +1,13 @@ package com.cm.inspection.service; import com.cm.common.base.AbstractService; +import com.cm.common.plugin.oauth.service.user.IUserService; +import com.cm.common.plugin.pojo.bos.UserResourceBO; import com.cm.common.token.app.AppTokenManager; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; /** * When you feel like quitting. Think about why you started @@ -27,4 +33,16 @@ public class BaseService extends AbstractService { return AppTokenManager.getInstance().getToken(token).getUserId(); } + protected List listUserIdsByKeyword(String keyword, IUserService userService) { + if (StringUtils.isBlank(keyword)) { + return null; + } + List userResourceBOs = userService.listResourceByKeywords(keyword); + List userIds = new ArrayList<>(); + userResourceBOs.forEach(userResourceBO -> { + userIds.add(userResourceBO.getUserId()); + }); + return userIds; + } + } diff --git a/src/main/java/com/cm/inspection/service/check/ICheck2Service.java b/src/main/java/com/cm/inspection/service/check/ICheck2Service.java index 8843035..c5079d6 100644 --- a/src/main/java/com/cm/inspection/service/check/ICheck2Service.java +++ b/src/main/java/com/cm/inspection/service/check/ICheck2Service.java @@ -4,6 +4,7 @@ import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResultList; import com.cm.inspection.pojo.dtos.check.Check2DTO; import com.cm.inspection.pojo.dtos.check.Check2LogDTO; +import com.cm.inspection.pojo.dtos.check.CheckSimpleWithEnterpriseDTO; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import com.cm.inspection.pojo.vos.check.Check2VO; @@ -133,6 +134,15 @@ public interface ICheck2Service { */ SuccessResultList> listPageStreetOfMine(ListPage page); + /** + * 我的街道案件列表 + * + * @param token + * @param page + * @return + */ + SuccessResultList> listPageStreetOfMine(String token, ListPage page); + /** * 我的旗县区委办局案件列表 * @@ -141,6 +151,15 @@ public interface ICheck2Service { */ SuccessResultList> listPageDistrictDepartmentOfMine(ListPage page); + /** + * 我的旗县区委办局案件列表 + * + * @param token + * @param page + * @return + */ + SuccessResultList> listPageDistrictDepartmentOfMine(String token, ListPage page); + /** * 我的旗县区案件列表 * @@ -149,6 +168,15 @@ public interface ICheck2Service { */ SuccessResultList> listPageDistrictOfMine(ListPage page); + /** + * 我的旗县区案件列表 + * + * @param token + * @param page + * @return + */ + SuccessResultList> listPageDistrictOfMine(String token, ListPage page); + /** * 我的市案件列表 * @@ -157,6 +185,15 @@ public interface ICheck2Service { */ SuccessResultList> listPageCityOfMine(ListPage page); + /** + * 我的市案件列表 + * + * @param token + * @param page + * @return + */ + SuccessResultList> listPageCityOfMine(String token, ListPage page); + /** * 结束街道案件 * @@ -165,6 +202,15 @@ public interface ICheck2Service { */ void updateStreetComplete(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 结束街道案件 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateStreetComplete(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 街道案件上报领导 * @@ -173,6 +219,15 @@ public interface ICheck2Service { */ void updateStreetToLeader(String checkId, StreetToLeaderVO streetToLeaderVO); + /** + * 街道案件上报领导 + * + * @param token + * @param checkId + * @param streetToLeaderVO + */ + void updateStreetToLeader(String token, String checkId, StreetToLeaderVO streetToLeaderVO); + /** * 旗县区委办局案件完成 * @@ -181,6 +236,15 @@ public interface ICheck2Service { */ void updateDistrictDepartmentComplete(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 旗县区委办局案件完成 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateDistrictDepartmentComplete(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 旗县区委办局案件回退 * @@ -189,6 +253,15 @@ public interface ICheck2Service { */ void updateDistrictDepartmentBack(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 旗县区委办局案件回退 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateDistrictDepartmentBack(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 检查日志 * @@ -205,6 +278,15 @@ public interface ICheck2Service { */ void updateDistrictComplete(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 旗县区案件完成 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateDistrictComplete(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 旗县区案件回退 * @@ -213,6 +295,15 @@ public interface ICheck2Service { */ void updateDistrictBack(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 旗县区案件回退 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateDistrictBack(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 旗县区案件上报领导 * @@ -221,6 +312,15 @@ public interface ICheck2Service { */ void updateDistrictToLeader(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 旗县区案件上报领导 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateDistrictToLeader(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 市案件完成 * @@ -229,6 +329,15 @@ public interface ICheck2Service { */ void updateCityComplete(String checkId, CheckCompleteVO checkCompleteVO); + /** + * 市案件完成 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateCityComplete(String token, String checkId, CheckCompleteVO checkCompleteVO); + /** * 市案件回退 * @@ -236,4 +345,38 @@ public interface ICheck2Service { * @param checkCompleteVO */ void updateCityBack(String checkId, CheckCompleteVO checkCompleteVO); + + /** + * 市案件回退 + * + * @param token + * @param checkId + * @param checkCompleteVO + */ + void updateCityBack(String token, String checkId, CheckCompleteVO checkCompleteVO); + + /** + * 我的历史列表 + * + * @param page + * @return + */ + SuccessResultList> listPageHistoryOfMine(ListPage page); + + /** + * 我的历史列表 + * + * @param token + * @param page + * @return + */ + SuccessResultList> listPageHistoryOfMine(String token, ListPage page); + + /** + * 检查表列表 + * + * @param params + * @return + */ + List listSimpleWithEnterprise(Map params); } diff --git a/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java b/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java index a9d6a70..ef632ba 100644 --- a/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java @@ -5,6 +5,7 @@ import com.cm.common.plugin.oauth.service.user.IUserService; import com.cm.common.plugin.pojo.bos.UserResourceBO; import com.cm.common.pojo.ListPage; import com.cm.common.result.SuccessResultList; +import com.cm.common.token.app.AppTokenManager; import com.cm.common.utils.DateUtil; import com.cm.common.utils.HashMapUtil; import com.cm.common.utils.UUIDUtil; @@ -12,6 +13,7 @@ import com.cm.inspection.dao.check.ICheck2Dao; import com.cm.inspection.enums.*; import com.cm.inspection.pojo.dtos.check.Check2DTO; import com.cm.inspection.pojo.dtos.check.Check2LogDTO; +import com.cm.inspection.pojo.dtos.check.CheckSimpleWithEnterpriseDTO; import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; import com.cm.inspection.pojo.dtos.checkitemoption.CheckItemOptionDTO; import com.cm.inspection.pojo.dtos.enterprise.EnterpriseDTO; @@ -132,11 +134,71 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { public Check2DTO get(String checkId) { Map params = getHashMap(2); params.put("checkId", checkId); - return get(params); + Check2DTO check2DTO = get(params); + + params.clear(); + if (check2DTO != null) { + List checkItemDTOs = hiddenDangerReportService.listCheckItemByCheckId(checkId); + List checkItemParentIds = new ArrayList<>(); + for (CheckItemDTO checkItemDTO : checkItemDTOs) { + setCheckItemParentIds(checkItemParentIds, checkItemDTO); + List hiddenDangerReportDTOs = hiddenDangerReportService.listHiddenDangerReportByCheckIdAndCheckItemId(checkId, checkItemDTO.getCheckItemId()); + checkItemDTO.setHiddenDangerReports(hiddenDangerReportDTOs); + } + check2DTO.setCheckItems(checkItemDTOs); + if (!checkItemParentIds.isEmpty()) { + params.put("checkItemIds", checkItemParentIds); + setCheckItemParent(params, checkItemDTOs); + } + } + return check2DTO; + } + + /** + * 设置上级ID + * + * @param checkItemDTO + * @return + */ + private void setCheckItemParentIds(List checkItemParentIds, CheckItemDTO checkItemDTO) { + if (!StringUtils.isBlank(checkItemDTO.getCheckItemParentId()) && !StringUtils.equals("0", checkItemDTO.getCheckItemParentId())) { + checkItemParentIds.add(checkItemDTO.getCheckItemParentId()); + } + } + + /** + * 设置上级选项列表 + * + * @param params + * @param unPassCheckItem + */ + public void setCheckItemParent(Map params, List unPassCheckItem) { + List checkItemDTOs = checkItemService.listCheckItem(params); + List checkItemParentIds = new ArrayList<>(); + for (CheckItemDTO checkItemDTO : checkItemDTOs) { + setCheckItemParentIds(checkItemParentIds, checkItemDTO); + } + unPassCheckItem.addAll(checkItemDTOs); + if (!checkItemParentIds.isEmpty()) { + params.put("checkItemIds", checkItemParentIds); + setCheckItemParent(params, unPassCheckItem); + } } @Override public List list(Map params) { + if (params.get("reporter") != null) { + String reporter = params.get("reporter").toString(); + if (!StringUtils.isBlank(reporter)) { + List userIds = listUserIdsByKeyword(reporter, userService); + if (userIds.isEmpty()) { + return new ArrayList<>(); + } else { + params.put("creators", userIds); + } + } + } + List check2DTOs = check2Dao.list(params); setUserInfo(check2DTOs); return check2DTOs; @@ -152,7 +214,8 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public SuccessResultList> listPageCheckOfMine(ListPage page) { - return null; + page.getParams().put("creator", securityComponent.getCurrentUser().getUserId()); + return listPage(page); } @Override @@ -187,26 +250,46 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public SuccessResultList> listPageStreetOfMine(ListPage page) { - return listPageOfMine(page); + return listPageOfMine(securityComponent.getCurrentUser().getUserId(), page); + } + + @Override + public SuccessResultList> listPageStreetOfMine(String token, ListPage page) { + return listPageOfMine(AppTokenManager.getInstance().getToken(token).getUserId(), page); } @Override public SuccessResultList> listPageDistrictDepartmentOfMine(ListPage page) { - return listPageOfMine(page); + return listPageOfMine(securityComponent.getCurrentUser().getUserId(), page); + } + + @Override + public SuccessResultList> listPageDistrictDepartmentOfMine(String token, ListPage page) { + return listPageOfMine(AppTokenManager.getInstance().getToken(token).getUserId(), page); } @Override public SuccessResultList> listPageDistrictOfMine(ListPage page) { - return listPageOfMine(page); + return listPageOfMine(securityComponent.getCurrentUser().getUserId(), page); + } + + @Override + public SuccessResultList> listPageDistrictOfMine(String token, ListPage page) { + return listPageOfMine(AppTokenManager.getInstance().getToken(token).getUserId(), page); } @Override public SuccessResultList> listPageCityOfMine(ListPage page) { - return listPageOfMine(page); + return listPageOfMine(securityComponent.getCurrentUser().getUserId(), page); } - private SuccessResultList> listPageOfMine(ListPage page) { - List tasks = processService.listTaskByAssignee(securityComponent.getCurrentUser().getUserId()); + @Override + public SuccessResultList> listPageCityOfMine(String token, ListPage page) { + return listPageOfMine(AppTokenManager.getInstance().getToken(token).getUserId(), page); + } + + private SuccessResultList> listPageOfMine(String userId, ListPage page) { + List tasks = processService.listTaskByAssignee(userId); List checkIds = listLastCheckId(tasks); if (checkIds.isEmpty()) { return new SuccessResultList<>(new ArrayList<>(), 1, 0L); @@ -217,25 +300,26 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public void updateStreetComplete(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); - if (task == null) { - throw new SearchException("任务不存在"); - } - LOG.debug("标记任务为完成状态"); - updateCheckIsCompleteInfo(null, checkId, 1); + updateTaskComplete(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } - LOG.debug("执行流程"); - Map params = getHashMap(4); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - processService.completeByTaskId(task.getId(), params); - LOG.debug("流程完成"); + @Override + public void updateStreetComplete(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateTaskComplete(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); } @Override public void updateStreetToLeader(String checkId, StreetToLeaderVO streetToLeaderVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + updateStreetTaskToLeader(securityComponent.getCurrentUser().getUserId(), checkId, streetToLeaderVO); + } + + @Override + public void updateStreetToLeader(String token, String checkId, StreetToLeaderVO streetToLeaderVO) { + updateStreetTaskToLeader(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, streetToLeaderVO); + } + + private void updateStreetTaskToLeader(String userId, String checkId, StreetToLeaderVO streetToLeaderVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(userId, CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); if (task == null) { throw new SearchException("任务不存在"); } @@ -248,25 +332,33 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public void updateDistrictDepartmentComplete(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); - if (task == null) { - throw new SearchException("任务不存在"); - } - LOG.debug("标记任务为完成状态"); - updateCheckIsCompleteInfo(null, checkId, 1); + updateTaskComplete(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } - LOG.debug("执行流程"); - Map params = getHashMap(4); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - processService.completeByTaskId(task.getId(), params); - LOG.debug("流程完成"); + @Override + public void updateDistrictDepartmentComplete(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateTaskComplete(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); } @Override public void updateDistrictDepartmentBack(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + updateDistrictDepartmentTaskBack(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } + + @Override + public void updateDistrictDepartmentBack(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateDistrictDepartmentTaskBack(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); + } + + /** + * 旗县区委办局案件回退 + * + * @param userId + * @param checkId + * @param checkCompleteVO + */ + private void updateDistrictDepartmentTaskBack(String userId, String checkId, CheckCompleteVO checkCompleteVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(userId, CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); if (task == null) { throw new SearchException("任务不存在"); } @@ -340,26 +432,33 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public void updateDistrictComplete(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); - if (task == null) { - throw new SearchException("任务不存在"); - } - LOG.debug("标记任务为完成状态"); - updateCheckIsCompleteInfo(null, checkId, 1); + updateTaskComplete(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } - LOG.debug("执行流程"); - Map params = getHashMap(4); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - processService.completeByTaskId(task.getId(), params); - - LOG.debug("流程完成"); + @Override + public void updateDistrictComplete(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateTaskComplete(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); } @Override public void updateDistrictBack(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + updateDistrictTaskBack(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } + + @Override + public void updateDistrictBack(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateDistrictTaskBack(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); + } + + /** + * 旗县区管理员案件回退 + * + * @param userId + * @param checkId + * @param checkCompleteVO + */ + private void updateDistrictTaskBack(String userId, String checkId, CheckCompleteVO checkCompleteVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(userId, CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); if (task == null) { throw new SearchException("任务不存在"); } @@ -380,11 +479,26 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public void updateDistrictToLeader(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + updateDistrictTaskToLeader(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } + + @Override + public void updateDistrictToLeader(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateDistrictTaskToLeader(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); + } + + /** + * 旗县区任务上报领导 + * + * @param userId + * @param checkId + * @param checkCompleteVO + */ + private void updateDistrictTaskToLeader(String userId, String checkId, CheckCompleteVO checkCompleteVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(userId, CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); if (task == null) { throw new SearchException("任务不存在"); } - String userId = securityComponent.getCurrentUser().getUserId(); GridPersonnelPO gridPersonnelPO = gridPersonnelService.getLeaderPOByUserId(userId); if (gridPersonnelPO == null) { throw new SearchException("上级领导不存在"); @@ -401,26 +515,33 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public void updateCityComplete(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); - if (task == null) { - throw new SearchException("任务不存在"); - } - LOG.debug("标记任务为完成状态"); - updateCheckIsCompleteInfo(null, checkId, 1); + updateTaskComplete(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } - LOG.debug("执行流程"); - Map params = getHashMap(4); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); - params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); - - processService.completeByTaskId(task.getId(), params); - LOG.debug("流程完成"); + @Override + public void updateCityComplete(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateTaskComplete(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); } @Override public void updateCityBack(String checkId, CheckCompleteVO checkCompleteVO) { - Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(securityComponent.getCurrentUser().getUserId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + updateCityTaskBack(securityComponent.getCurrentUser().getUserId(), checkId, checkCompleteVO); + } + + @Override + public void updateCityBack(String token, String checkId, CheckCompleteVO checkCompleteVO) { + updateCityTaskBack(AppTokenManager.getInstance().getToken(token).getUserId(), checkId, checkCompleteVO); + } + + /** + * 市案件回退 + * + * @param userId + * @param checkId + * @param checkCompleteVO + */ + private void updateCityTaskBack(String userId, String checkId, CheckCompleteVO checkCompleteVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(userId, CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); if (task == null) { throw new SearchException("任务不存在"); } @@ -439,6 +560,68 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { LOG.debug("流程回退"); } + /** + * 完成任务 + * + * @param userId + * @param checkId + * @param checkCompleteVO + */ + private void updateTaskComplete(String userId, String checkId, CheckCompleteVO checkCompleteVO) { + Task task = processService.getTaskByAssigneeAndVariableKeyAndValue(userId, CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + if (task == null) { + throw new SearchException("任务不存在"); + } + LOG.debug("标记任务为完成状态"); + updateCheckIsCompleteInfo(null, checkId, 1); + + LOG.debug("执行流程"); + Map params = getHashMap(4); + params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); + params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); + params.put(CheckProcessParamsEnum.SUMMARY.getValue(), checkCompleteVO.getSummary()); + processService.completeByTaskId(task.getId(), params); + LOG.debug("流程完成"); + } + + @Override + public SuccessResultList> listPageHistoryOfMine(ListPage page) { + return listPageHistoryByUserId(securityComponent.getCurrentUser().getUserId(), page); + } + + @Override + public SuccessResultList> listPageHistoryOfMine(String token, ListPage page) { + return listPageHistoryByUserId(AppTokenManager.getInstance().getToken(token).getUserId(), page); + } + + @Override + public List listSimpleWithEnterprise(Map params) { + return check2Dao.listSimpleWithEnterprise(params); + } + + public SuccessResultList> listPageHistoryByUserId(String userId, ListPage page) { + List historicTaskInstances = processService.listHistoricTaskInstanceByAssignee(userId); + if (historicTaskInstances.isEmpty()) { + return new SuccessResultList<>(new ArrayList<>(), 1, 0L); + } + Set taskIds = new HashSet<>(); + historicTaskInstances.forEach(historicTaskInstance -> { + taskIds.add(historicTaskInstance.getId()); + }); + Set checkIds = new HashSet<>(); + List historicVariableInstances = processService.listHistoricVariableInstanceByKeyAndValue(taskIds); + historicVariableInstances.forEach(historicVariableInstance -> { + if (StringUtils.equals(historicVariableInstance.getVariableName(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue())) { + checkIds.add(historicVariableInstance.getValue().toString()); + } + }); + if (checkIds.isEmpty()) { + return new SuccessResultList<>(new ArrayList<>(), 1, 0L); + } + page.getParams().put("checkIds", new ArrayList<>(checkIds)); + return listPage(page); + } + /** * 上报案件到委办局，逻辑：查找当前用户上级网格员，存在则将案件进行转发，否则抛出异常 * @@ -530,6 +713,9 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { Map params = getHashMap(16); LOG.debug("获取复查流程当前节点任务"); Task task = processService.getTaskByAssigneeAndBusinessKey(grid, businessKey); + if(task == null) { + throw new SearchException("任务不存在"); + } LOG.debug("检查结果是否全部通过"); int isAllPass = saveCheckResult(token, reCheckId, check2VO); params.put(CheckProcessParamsEnum.IS_ALL_PASS.getValue(), isAllPass); diff --git a/src/main/java/com/cm/inspection/service/process/IProcessService.java b/src/main/java/com/cm/inspection/service/process/IProcessService.java index 158208c..f551785 100644 --- a/src/main/java/com/cm/inspection/service/process/IProcessService.java +++ b/src/main/java/com/cm/inspection/service/process/IProcessService.java @@ -317,6 +317,22 @@ public interface IProcessService { */ List listHistoricTaskInstanceByKeyAndValue(String key, Object value); + /** + * 历史任务实例列表 + * + * @param assignee + * @return + */ + List listHistoricTaskInstanceByAssignee(String assignee); + + /** + * 历史任务实例列表 + * + * @param assigneeIds + * @return + */ + List listHistoricTaskInstanceByAssignees(List assigneeIds); + /** * 任务历史变量 * diff --git a/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java b/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java index daaad0e..935e6ce 100644 --- a/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java @@ -282,6 +282,16 @@ public class ProcessServiceImpl implements IProcessService { return historyService.createHistoricTaskInstanceQuery().taskVariableValueEquals(key, value).orderByHistoricTaskInstanceStartTime().asc().list(); } + @Override + public List listHistoricTaskInstanceByAssignee(String assignee) { + return historyService.createHistoricTaskInstanceQuery().taskAssignee(assignee).list(); + } + + @Override + public List listHistoricTaskInstanceByAssignees(List assigneeIds) { + return historyService.createHistoricTaskInstanceQuery().taskAssigneeIds(assigneeIds).list(); + } + @Override public List listHistoricVariableInstanceByKeyAndValue(String taskId) { return historyService.createHistoricVariableInstanceQuery().taskId(taskId).list(); diff --git a/src/main/resources/mybatis/mapper/check/check2-mapper.xml b/src/main/resources/mybatis/mapper/check/check2-mapper.xml index 651cd84..1b3a757 100644 --- a/src/main/resources/mybatis/mapper/check/check2-mapper.xml +++ b/src/main/resources/mybatis/mapper/check/check2-mapper.xml @@ -339,6 +339,13 @@ AND t1.creator = #{creator} + + AND + t1.creator IN + + #{creators[${index}]} + + AND LEFT(t1.gmt_create, 7) = #{checkMonth} @@ -515,7 +522,7 @@ - SELECT t1.enterprise_id, jt1.name enterprise_name, diff --git a/src/main/resources/static/route/check2/get-check-item.html b/src/main/resources/static/route/check2/get-check-item.html index 1fb0ad7..87d061a 100644 --- a/src/main/resources/static/route/check2/get-check-item.html +++ b/src/main/resources/static/route/check2/get-check-item.html @@ -130,7 +130,7 @@ // 初始化内容 function initData() { var loadLayerIndex; - top.restAjax.get(top.restAjax.path('api/check/getcheckbyid/{checkId}', [checkId]), {}, null, function(code, data) { + top.restAjax.get(top.restAjax.path('api/check2/get/{checkId}', [checkId]), {}, null, function(code, data) { var dataFormData = { enterpriseId: data.enterpriseId, enterpriseName: data.nameJoinByEnterpriseId, diff --git a/src/main/resources/static/route/check2/get-map-check.html b/src/main/resources/static/route/check2/get-map-check.html index f4d2506..1d56a74 100644 --- a/src/main/resources/static/route/check2/get-map-check.html +++ b/src/main/resources/static/route/check2/get-map-check.html @@ -336,7 +336,7 @@ div.addEventListener('click', function() { top.dialog.open({ - url: top.restAjax.path('route/check/get-check-item.html?checkId={checkId}', [self.checkId]), + url: top.restAjax.path('route/check2/get-check-item.html?checkId={checkId}', [self.checkId]), title: '【'+ self.enterpriseName + '】检、复查选项', width: '600px', height: '80%', @@ -366,7 +366,7 @@ function initData() { var loadLayerIndex; - top.restAjax.get(top.restAjax.path('api/check/listchecksimplewithenterprise', []), { + top.restAjax.get(top.restAjax.path('api/check2/list-simple-with-enterprise', []), { keywords: $('#keywords').val(), area1: '6aba668e-8ab3-4fbb-8886-b2d468ccf00e', area2: $('#area2').val() ? $('#area2').val() : '', diff --git a/src/main/resources/static/route/check2/list-city-of-mine.html b/src/main/resources/static/route/check2/list-city-of-mine.html index bfa1dbb..11756aa 100644 --- a/src/main/resources/static/route/check2/list-city-of-mine.html +++ b/src/main/resources/static/route/check2/list-city-of-mine.html @@ -22,6 +22,9 @@
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ +
+ + +
+
+ + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/check2/list-street-of-mine.html b/src/main/resources/static/route/check2/list-street-of-mine.html index d4d7fcd..775ea0a 100644 --- a/src/main/resources/static/route/check2/list-street-of-mine.html +++ b/src/main/resources/static/route/check2/list-street-of-mine.html @@ -22,6 +22,9 @@
+
+ +