Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

liyanqi

2022-09-15 bff8bccf908b0109cab46e6520df47019a35bed0

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 ycl-common/src/main/java/com/ycl/entity/platform/zfreport/EnforcelawReport.java

@@ -1,5 +1,6 @@
package com.ycl.entity.platform.zfreport;

import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -108,18 +109,21 @@
     * 当事人姓名
     */
    @TableField("partiesName")
    @ExcelProperty(value = "当事人姓名",index = 0)
    private String partiesName;

    /**
     * 当事人身份证号码
     */
    @TableField("partiesID")
    @ExcelProperty(value = "当事人身份证号码",index = 1)
    private String partiesID;

    /**
     * 当事人联系电话
     */
    @TableField("partiesPhone")
    @ExcelProperty(value = "当事人联系电话",index = 2)
    private String partiesPhone;

    /**

 ycl-common/src/main/java/com/ycl/service/platform/zfreport/impl/EnforcelawReportServiceImpl.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.platform.zfreport.EnforcelawReport;
import com.ycl.mapper.platform.zfreport.EnforcelawReportMapper;
import com.ycl.service.platform.zfreport.IEnforcelawReportService;
import com.ycl.service.platform.zfreport.EnforcelawReportService;
import org.springframework.stereotype.Service;

/**
@@ -15,6 +15,6 @@
 * @since 2022-09-14
 */
@Service
public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforcelawReport> implements IEnforcelawReportService {
public class EnforcelawReportServiceImpl extends ServiceImpl<EnforcelawReportMapper, EnforcelawReport> implements EnforcelawReportService {

}

 ycl-generator/pom.xml

@@ -73,6 +73,12 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-annotations</artifactId>
            <version>1.5.22</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>

    <build>

 ycl-platform/src/main/java/com/ycl/controller/zfreport/EnforcelawReportController.java

@@ -1,10 +1,23 @@
package com.ycl.controller.zfreport;


import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.platform.zfreport.EnforcelawReport;
import com.ycl.service.platform.zfreport.EnforcelawReportService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;

/**
 * <p>
@@ -19,5 +32,90 @@
@Api(tags = "执法管理：违规事项处置管理")
public class EnforcelawReportController extends BaseController {

    @Autowired
    EnforcelawReportService enforcelawReportService;
    
    @GetMapping("/search")
    @ApiOperation("查询全部城市违建详情")
    public CommonResult getAll(@RequestParam(required = false) String startTime,
                               @RequestParam(required = false) String endTime,
                               @RequestParam(required = false) String community,
                               @RequestParam(required = false) String status,
                               @RequestParam(required = false) String partiesName,
                               @RequestParam(required = false) String partiesID
    ) {
        QueryWrapper<EnforcelawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
            enforcelawReportQueryWrapper.between("cTime", startTime, endTime);
        }
        if (StringUtils.isNotBlank(community)) {
            enforcelawReportQueryWrapper.eq("community", community);
        }
        if (StringUtils.isNotBlank(status)) {
            enforcelawReportQueryWrapper.eq("status", status);
        }
        if (StringUtils.isNotBlank(partiesName)) {
            enforcelawReportQueryWrapper.eq("partiesName", partiesName);
        }
        if (StringUtils.isNotBlank(partiesID)) {
            enforcelawReportQueryWrapper.eq("partiesID", partiesID);
        }
        return CommonResult.success(enforcelawReportService.list(enforcelawReportQueryWrapper));
    }

    @GetMapping("/search/one")
    @ApiOperation("查询城市违建详情")
    public CommonResult getOne(@RequestParam Integer id) {
        return CommonResult.success(enforcelawReportService.getOne(new QueryWrapper<EnforcelawReport>().eq("id", id)));
    }

    @PostMapping("/add")
    @ApiOperation("添加城市违建详情")
    public CommonResult add(@RequestBody EnforcelawReport enforcelawReport) {
        return CommonResult.success(enforcelawReportService.save(enforcelawReport));
    }

    @DeleteMapping("/delete")
    @ApiOperation("删除城市违建详情")
    public CommonResult remove(@RequestParam Integer id) {
        return CommonResult.success(enforcelawReportService.removeById(id));
    }

    @PutMapping("/update")
    @ApiOperation("修改城市违建详情")
    public CommonResult modify(@RequestBody EnforcelawReport enforcelawReport) {
        return CommonResult.success(enforcelawReportService.updateById(enforcelawReport));
    }

    @GetMapping("/download")
    @ApiOperation("查询城市违建详情")
    @SneakyThrows
    public void downloadExcel(@RequestParam(required = false) String startTime,
                              @RequestParam(required = false) String endTime,
                              @RequestParam(required = false) String community,
                              @RequestParam(required = false) String status,
                              @RequestParam(required = false) String partiesName,
                              @RequestParam(required = false) String partiesID,
                              HttpServletResponse response) {
        QueryWrapper<EnforcelawReport> enforcelawReportQueryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
            enforcelawReportQueryWrapper.between("cTime", startTime, endTime);
        }
        if (StringUtils.isNotBlank(community)) {
            enforcelawReportQueryWrapper.eq("community", community);
        }
        if (StringUtils.isNotBlank(status)) {
            enforcelawReportQueryWrapper.eq("status", status);
        }
        if (StringUtils.isNotBlank(partiesName)) {
            enforcelawReportQueryWrapper.eq("partiesName", partiesName);
        }
        if (StringUtils.isNotBlank(partiesID)) {
            enforcelawReportQueryWrapper.eq("partiesID", partiesID);
        }
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setCharacterEncoding("utf-8");
        response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode("城市违建" + ".xlsx", "utf-8"));
        EasyExcel.write(response.getOutputStream(), EnforcelawReport.class).sheet("列表").doWrite(enforcelawReportService.list(enforcelawReportQueryWrapper));
    }
}