xiangpei
2025-01-03 9c322f4ae707c2a8a817c28d683177930d0ca474
Integer改为Long
22个文件已修改
64 ■■■■ 已修改文件
business/src/main/java/com/ycl/controller/PlanController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/entity/FlowLog.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/vo/FlowLogVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/mapper/FlowLogMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/mapper/PlanMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/FlowLogService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/PlanService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/ProjectPlanRecordService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
start/src/main/java/com/ycl/web/controller/tool/TestController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/controller/PlanController.java
@@ -70,7 +70,7 @@
    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('plan:detail')")
    public Result detail(@PathVariable("id") Integer id) {
    public Result detail(@PathVariable("id") Long id) {
        return planService.detail(id);
    }
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -71,7 +71,7 @@
    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('projectPlanExamineRecord:detail')")
    public Result detail(@PathVariable("id") Integer id) {
    public Result detail(@PathVariable("id") Long id) {
        return projectPlanExamineRecordService.detail(id);
    }
business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java
@@ -71,7 +71,7 @@
    @PostMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
//    @PreAuthorize("hasAuthority('projectPlanRecord:detail')")
    public Result detail(@PathVariable("id") Integer id) {
    public Result detail(@PathVariable("id") Long id) {
        return projectPlanRecordService.detail(id);
    }
business/src/main/java/com/ycl/domain/entity/FlowLog.java
@@ -28,7 +28,7 @@
    @TableField("project_id")
    /** 项目id */
    private Integer projectId;
    private Long projectId;
    @TableField("flow_ins_id")
    /** 流程实例id */
@@ -36,7 +36,7 @@
    @TableField("user_id")
    /** 产生日志的人/或其它 */
    private Integer userId;
    private Long userId;
    @TableField("event_data_json")
    /** 事件数据,根据不同的事件可存储对应的扩展数据。如转办事件可存储转办前后的处理人信息 */
business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java
@@ -35,7 +35,7 @@
    private String targetId;
    @ApiModelProperty("项目id,用于保存日志")
    private Integer projectId;
    private Long projectId;
    @ApiModelProperty("流程实例id,用于保存日志")
    private String processInsId;
business/src/main/java/com/ycl/domain/vo/FlowLogVO.java
@@ -30,7 +30,7 @@
    /** 项目id */
    @ApiModelProperty("项目id")
    private Integer projectId;
    private Long projectId;
    /** 流程实例id */
    @ApiModelProperty("流程实例id")
@@ -38,7 +38,7 @@
    /** 产生日志的人/或其它 */
    @ApiModelProperty("产生日志的人/或其它")
    private Integer userId;
    private Long userId;
    /** 事件数据,根据不同的事件可存储对应的扩展数据。如转办事件可存储转办前后的处理人信息 */
    @ApiModelProperty("事件数据,根据不同的事件可存储对应的扩展数据。如转办事件可存储转办前后的处理人信息")
business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java
@@ -8,7 +8,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanResponseVO {
    private Integer id;
    private Long id;
    private String projectName;
    private Integer reportStatus;
    private String projectCode;
business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java
@@ -12,7 +12,7 @@
@NoArgsConstructor
public class ProjetPlanRecordItem {
    // 项目计划记录id
    private Integer id;
    private Long id;
    // 项目名称
    private String projectName;
    // 项目代码
business/src/main/java/com/ycl/mapper/FlowLogMapper.java
@@ -23,7 +23,7 @@
     * @param id
     * @return
     */
    FlowLogVO getById(Integer id);
    FlowLogVO getById(Long id);
    /**
    *  分页
business/src/main/java/com/ycl/mapper/PlanMapper.java
@@ -22,7 +22,7 @@
     * @param id
     * @return
     */
    PlanVO getById(Integer id);
    PlanVO getById(Long id);
    /**
    *  分页
business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
@@ -27,7 +27,7 @@
     * @param id
     * @return
     */
    ProjectPlanExamineRecordVO getById(Integer id);
    ProjectPlanExamineRecordVO getById(Long id);
    /**
    *  分页
business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java
@@ -37,7 +37,7 @@
    /**
     *  根据项目id和标志查询计划列表
     */
    List<ProjetPlanRecordItem> selectPlanList(@Param("id") Integer id, @Param("flag") Integer flag);
    List<ProjetPlanRecordItem> selectPlanList(@Param("id") Long id, @Param("flag") Integer flag);
    void insertItem(ProjectPlanRecord item);
}
business/src/main/java/com/ycl/service/FlowLogService.java
@@ -23,7 +23,7 @@
     * @param projectId 项目id
     * @param eventDataJson json扩展内容
     */
    void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Integer projectId, String eventDataJson);
    void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Long projectId, String eventDataJson);
    /**
     * 批量删除
@@ -51,7 +51,7 @@
     * @param id
     * @return
     */
    Result detail(Integer id);
    Result detail(Long id);
    /**
     * 列表
business/src/main/java/com/ycl/service/PlanService.java
@@ -62,7 +62,7 @@
     * @param id
     * @return
     */
    Result detail(Integer id);
    Result detail(Long id);
    /**
     * 列表
business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
@@ -57,7 +57,7 @@
     * @param id
     * @return
     */
    Result detail(Integer id);
    Result detail(Long id);
    /**
     * 列表
business/src/main/java/com/ycl/service/ProjectPlanRecordService.java
@@ -57,7 +57,7 @@
     * @param id
     * @return
     */
    Result detail(Integer id);
    Result detail(Long id);
    /**
     * 列表
business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
@@ -31,7 +31,6 @@
    /**
     * 添加日志
     *
     * @param taskId 任务id
     * @param flowInsId 流程实例id
     * @param eventType 事件类型
@@ -39,7 +38,7 @@
     * @param eventDataJson json扩展内容
     */
    @Override
    public void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Integer projectId, String eventDataJson) {
    public void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Long projectId, String eventDataJson) {
        FlowLog log = new FlowLog();
        log.setTaskId(taskId);
        log.setFlowInsId(flowInsId);
@@ -89,7 +88,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(Long id) {
        FlowLogVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        return Result.ok().data(vo);
business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
@@ -8,7 +8,6 @@
import com.ycl.common.enums.business.ProjectTypeEnum;
import com.ycl.common.utils.DateUtils;
import com.ycl.domain.entity.Plan;
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.vo.ProjectPlanResponseVO;
import com.ycl.domain.vo.ProjetPlanRecordItem;
import com.ycl.framework.utils.PageUtil;
@@ -247,7 +246,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(Long id) {
        PlanVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        return Result.ok().data(vo);
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -114,7 +114,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(Long id) {
        ProjectPlanExamineRecordVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        return Result.ok().data(vo);
business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
@@ -178,7 +178,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(Long id) {
        ProjectPlanRecordResponseVO vo = new ProjectPlanRecordResponseVO();
        // 获取月度计划
        vo.setMonthRecords(baseMapper.selectPlanList(id, MONTH_FLAG));
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -343,6 +343,10 @@
                    }
                }
            }
            taskVO.setHandlerId(handlerIds);
            taskVO.setHandlerName(handlerNames);
            taskVO.setHandlerUnitId(handlerUnitIds);
            taskVO.setHandlerUnitName(handlerUnitNames);
            vos.add(taskVO);
        }
        result.put("taskList", vos);
start/src/main/java/com/ycl/web/controller/tool/TestController.java
@@ -47,9 +47,9 @@
    }
    @ApiOperation("获取用户详细")
    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Long.class)
    @GetMapping("/{userId}")
    public R<UserEntity> getUser(@PathVariable Integer userId)
    public R<UserEntity> getUser(@PathVariable Long userId)
    {
        if (!users.isEmpty() && users.containsKey(userId))
        {
@@ -63,7 +63,7 @@
    @ApiOperation("新增用户")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "Integer", dataTypeClass = Integer.class),
        @ApiImplicitParam(name = "userId", value = "用户id", dataType = "long", dataTypeClass = Long.class),
        @ApiImplicitParam(name = "username", value = "用户名称", dataType = "String", dataTypeClass = String.class),
        @ApiImplicitParam(name = "password", value = "用户密码", dataType = "String", dataTypeClass = String.class),
        @ApiImplicitParam(name = "mobile", value = "用户手机", dataType = "String", dataTypeClass = String.class)
@@ -97,9 +97,9 @@
    }
    @ApiOperation("删除用户信息")
    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
    @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = Long.class)
    @DeleteMapping("/{userId}")
    public R<String> delete(@PathVariable Integer userId)
    public R<String> delete(@PathVariable Long userId)
    {
        if (!users.isEmpty() && users.containsKey(userId))
        {