Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-08-19 62d2377c27bf65a048a7c104b256efcd32ad2319

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSwPatrolRecordApi.java

@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwSafetyWorkRecordVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -30,17 +31,20 @@
    @Resource
    private CommunityService communityService;

    @Resource
    private PartyBuildingService partyBuildingService;

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * @return 分页集合
     */
    @ApiOperation(value = "分页查询巡查记录", response = ComSwPatrolRecordVO.class)
    @PostMapping("/pagePatrolRecord")
    @PostMapping("/app/pagePatrolRecord")
    public R pagePatrolRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        if (comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
            comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getUserId()));
        if (!comSwPatrolRecordPageDTO.getSelectPerson().equals(1)) {
            comSwPatrolRecordPageDTO.setPatrolPerson(String.valueOf(this.getLoginUserInfo().getPhone()));
        }
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
        return communityService.pagePatrolRecord(comSwPatrolRecordPageDTO);
@@ -52,10 +56,11 @@
     * @return 新增结果
     */
    @ApiOperation(value = "新增巡查记录")
    @PostMapping("/addPatrolRecord")
    @PostMapping("/app/addPatrolRecord")
    public R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordAddDTO.setCommunityId(communityId);
        comSwPatrolRecordAddDTO.setCreateBy(this.getUserId());
        return communityService.addPatrolRecord(comSwPatrolRecordAddDTO);
    }

@@ -66,7 +71,7 @@
     * @return 巡查记录详情查询结果
     */
    @ApiOperation(value = "根据巡查记录id查询详情", response = ComSwPatrolRecordVO.class)
    @PostMapping("/detailPatrolRecord")
    @GetMapping("/app/detailPatrolRecord")
    public R detailPatrolRecord(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailPatrolRecord(patrolRecordId);
    }
@@ -77,7 +82,7 @@
     * @return 安全工作记录分页集合
     */
    @ApiOperation(value = "分页查询安全工作记录", response = ComSwSafetyWorkRecordVO.class)
    @PostMapping("/pageSafetyWorkRecord")
    @PostMapping("/app/pageSafetyWorkRecord")
    public R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
@@ -91,9 +96,10 @@
     * @return 安全工作记录详情查询结果
     */
    @ApiOperation(value = "根据安全工作记录id查询详情", response = ComSwSafetyWorkRecordVO.class)
    @PostMapping("/detailSafetyWorkRecord")
    @GetMapping("/app/detailSafetyWorkRecord")
    public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
        return communityService.detailSafetyWorkRecord(safetyWorkRecordId);
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return communityService.detailSafetyWorkRecord(safetyWorkRecordId, communityId);
    }

    /**
@@ -102,7 +108,7 @@
     * @return 隐患报告分页集合
     */
    @ApiOperation(value = "分页查询隐患报告", response = ComSwDangerReportVO.class)
    @PostMapping("/pageDangerReport")
    @PostMapping("/app/pageDangerReport")
    public R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO){
        Long communityId = this.getCommunityId();
        comSwPatrolRecordPageDTO.setCommunityId(communityId);
@@ -116,7 +122,7 @@
     * @return 隐患报告详情查询结果
     */
    @ApiOperation(value = "根据隐患报告id查询详情", response = ComSwDangerReportVO.class)
    @PostMapping("/detailDangerReport")
    @GetMapping("/app/detailDangerReport")
    public R detailDangerReport(@RequestParam(value = "dangerReportId") Long dangerReportId) {
        return communityService.detailDangerReport(dangerReportId);
    }
@@ -128,7 +134,7 @@
     * @return 隐患报告详情查询结果
     */
    @ApiOperation(value = "根据巡查记录id查询隐患报告详情", response = ComSwDangerReportVO.class)
    @PostMapping("/detailDangerReportByPrId")
    @GetMapping("/app/detailDangerReportByPrId")
    public R detailDangerReportByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
        return communityService.detailDangerReportByPrId(patrolRecordId);
    }
@@ -140,10 +146,42 @@
     * @return 整改结果
     */
    @ApiOperation(value = "整改隐患报告")
    @PostMapping("/rectifyDangerReport")
    @PostMapping("/app/rectifyDangerReport")
    public R rectifyDangerReport(@RequestBody ComSwDangerReportRectifyDTO comSwDangerReportRectifyDTO){
        return communityService.rectifyDangerReport(comSwDangerReportRectifyDTO);
    }

    /**
     * 根据日期查询值班人员
     * @return 查询结果
     */
    @ApiOperation(value = "根据日期查询值班人员")
    @GetMapping("/app/getRotaPersonByDate")
    public R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate){
        return communityService.getRotaPersonByDate(rotaDate);
    }

    /**
     * 根据日期查询值班领导
     * @return 查询结果
     */
    @ApiOperation(value = "根据日期查询值班领导")
    @GetMapping("/app/getRotaLeaderByDate")
    public R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate){
        return communityService.getRotaLeaderByDate(rotaDate);
    }

    /**
     * 选择人员
     * @param param 查询条件
     * @return 查询结果
     */
    @ApiOperation(value = "选择人员")
    @PostMapping("/app/getTotlePerson")
    public R getTotlePerson(@RequestParam(value = "param", required = false) String param){
        Long communityId = this.getLoginUserInfo().getCommunityId();
        return partyBuildingService.getTotlePerson(param,communityId);
    }

}