feat:补充提交

cjl

2023-09-26 c0c80bebcc93e90834e06404d6056322e51b02dd

feat:补充提交

 screen-api/src/main/java/com/moral/api/exception/GlobalExceptionHandler.java

@@ -42,7 +42,7 @@
    @ResponseBody
    @ResponseStatus(HttpStatus.OK)
    public ResultMessage handleUserNotExistException(BusinessException ex) {
        return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), "请求用户数据失败");
        return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(), ex.getMsg());
    }

    @ExceptionHandler

 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationChangeCond.java

@@ -45,7 +45,7 @@
    private String changeName;

    @ApiModelProperty(value = "状态")
    @NotEmpty(message = "状态不能为空！")
    @NotNull(message = "状态不能为空！")
    private Integer state;

    @ApiModelProperty(value = "整改附件")

 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationCheckCond.java

@@ -40,7 +40,7 @@
    private String checkDescribe;

    @ApiModelProperty(value = "状态")
    @NotEmpty(message = "状态不能为空！")
    @NotNull(message = "状态不能为空！")
    private Integer state;

    @ApiModelProperty(value = "审批附件")

 screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java

@@ -72,6 +72,7 @@
    private String problemDescribe;

    @ApiModelProperty(value = "状态")
    @NotNull(message = "状态不能为空！")
    private Integer state;

    @ApiModelProperty(value = "基础附件")

 screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java

@@ -23,4 +23,7 @@

    @ApiModelProperty(value = "文件名称")
    private String fileName;

    @ApiModelProperty(value = "类型1图片")
    private Integer fileType;
}

 screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java

@@ -27,4 +27,8 @@
     * 账户
     */
    private String account;
    /**
     * 所属部门责任单位
     */
    private Integer unitId;
}

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -13,6 +13,7 @@
import com.moral.api.pojo.query.PageCond;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.vo.approvetable.ApproveTableListVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.AllocationExtensionService;
import com.moral.api.service.ApproveTableService;
@@ -77,6 +78,7 @@
    private AllocationMapper allocationMapper;
    @Autowired
    private  SysAreaService sysAreaService;
    @Autowired
    private ApproveTableService approveTableService;
    @Autowired
    private FileTableService fileTableService;
@@ -332,7 +334,6 @@
            endTime = DateUtils.getCurDateTime();
            if (s.equals("-1")){
                //当前时间的

                 startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            }
            if (s.equals("-2")){
@@ -396,7 +397,6 @@

            AllocationUnitViewDto allocationUnitViewDto = new AllocationUnitViewDto();
            List<Allocation> allocations1 = unitMap.get(integer);

            //加分
            int marks=0;
            //减分
@@ -464,7 +464,7 @@
        allocationExt.setFileBaseList(fileTableService.list(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
        allocationExt.setFileChangeList(fileTableService.list(id,FileTableEnum.ALLOCATION_RECTIFICATION.value));
        allocationExt.setFileApproveList(fileTableService.list(id,FileTableEnum.ALLOCATION_APPROVE.value));
        allocationExt.setApproveList(approveTableService.listAll(id,FileTableEnum.ALLOCATION_FOUNDATION.value));
        allocationExt.setApproveList(approveTableService.listAll(id, FileTableEnum.ALLOCATION_FOUNDATION.value));
        return allocationExt;
    }

@@ -525,7 +525,7 @@
        }
        approveTable.setApproveModule(FileTableEnum.ALLOCATION_FOUNDATION.value);
        approveTableService.saveResult(approveTable);
        fileTableService.upDateResult(checkCond.getFileApproveList(),allocation.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
        fileTableService.upDateResult(checkCond.getFileApproveList(),checkCond.getAllocationId(), FileTableEnum.ALLOCATION_FOUNDATION.value);
    }

    @Override
@@ -564,7 +564,7 @@
        if( !AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(allocationExt.getState())) {
            type = true;
        }
        if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getState())){
        if(!ChangeEnum.DEADLINE.value.equals(allocationExt.getChangeType())){
            type = true;
        }
        if(type){

 screen-api/src/main/java/com/moral/api/service/impl/FileTableServiceImpl.java

@@ -64,7 +64,7 @@
            sysFile.setCreateId(user.getUserId()).setCreateName(user.getUserName());
        }
        save(sysFile);
        return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename);
        return new FileVo().setFileId(sysFile.getFileId()).setFileName(originalFilename).setFileType(fileType.getValue());
    }

    @Override
@@ -230,6 +230,7 @@
            FileVo fileVo = new FileVo();
            fileVo.setFileId(it.getFileId());
            fileVo.setFileName(it.getFileName());
            fileVo.setFileType(it.getFileType());
            list.add(fileVo);
        });
        return list;