Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-11-15 84e740f362d574b942b1c9a274425841c9167de8

 screen-api/src/main/java/com/moral/api/controller/SupervisionController.java

@@ -12,11 +12,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;

import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import com.alibaba.fastjson.JSONObject;
import com.moral.api.entity.Supervision;
import com.moral.api.service.SupervisionService;
import com.moral.constant.ResponseCodeEnum;
@@ -33,7 +36,10 @@
    private SupervisionService supervisionService;

    @PostMapping("add")
    public ResultMessage add(MultipartFile[] files, Supervision supervision) {
    public ResultMessage add(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
        Supervision supervision = JSONObject.parseObject(JSONObject.toJSONString(params), Supervision.class);
        Map<String, Object> response = supervisionService.add(files, supervision);
        if (!response.isEmpty()) {
            return ResultMessage.fail(Integer.parseInt(response.get("code").toString()), response.get("msg").toString());
@@ -43,6 +49,7 @@

    @ApiOperation(value = "分页督办单列表", notes = "分页督办单列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "organizationId", value = "组织id", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "cityCode", value = "地区码", required = false, paramType = "query", dataType = "int"),
            @ApiImplicitParam(name = "start", value = "开始时间", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "end", value = "结束时间", required = false, paramType = "query", dataType = "String"),
@@ -52,7 +59,7 @@
    @GetMapping("select")
    public ResultMessage select(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        if (!params.containsKey("cityCode")) {
        if (!params.containsKey("cityCode") && !params.containsKey("organizationId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }

@@ -62,7 +69,10 @@

    @ApiOperation(value = "修改督办单", notes = "修改督办单")
    @PostMapping("update")
    public ResultMessage update(MultipartFile[] files, Supervision supervision) {
    public ResultMessage update(HttpServletRequest request) {
        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
        List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
        Supervision supervision = JSONObject.parseObject(JSONObject.toJSONString(params), Supervision.class);
        Map<String, Object> response = supervisionService.updateSupervision(files, supervision);
        if (!response.isEmpty()) {
            return ResultMessage.fail(Integer.parseInt(response.get("code").toString()), response.get("msg").toString());