添加更新维修状态接口；任务管理、巡检计划查询时添加create_dept;数据统计接口添加@Autowired注解

guoshilong

2022-10-10 0cb1c897f9ddeef4542b33022e1578068a0fd608

添加更新维修状态接口；任务管理、巡检计划查询时添加create_dept;数据统计接口添加@Autowired注解

 src/main/java/org/springblade/modules/repairsorder/controller/RepairsorderController.java

@@ -123,5 +123,15 @@
        return R.status(repairsorderService.deleteLogic(Func.toLongList(ids)));
    }

    /**
     * 更新维修状态同时维修记录表中插入一条数据
     */
    @PostMapping("/updateState")
    @ApiOperationSupport(order = 7)
    @ApiOperation(value = "更新维修状态", notes = "传入repairsorder")
    public R updateState(@Valid @RequestBody RepairsorderEntity repairsorder) {
        return R.status(repairsorderService.updateState(repairsorder));
    }


}

 src/main/java/org/springblade/modules/repairsorder/service/IRepairsorderService.java

@@ -45,4 +45,5 @@
     */
    RepairsorderVO getRepairsorderMaxNo();

    Boolean updateState(RepairsorderEntity repairsorder);
}

 src/main/java/org/springblade/modules/repairsorder/service/impl/RepairsorderServiceImpl.java

@@ -80,5 +80,25 @@
        return baseMapper.getRepairsorderMaxNo();
    }

    @Override
    public Boolean updateState(RepairsorderEntity repairsorder) {
        //更新维修表状态
        boolean updateRepairsorder = this.updateById(repairsorder);
        //维修记录表数据插入
        RepairsorderRecordEntity repairsorderRecord = new RepairsorderRecordEntity();
        repairsorderRecord.setNo(repairsorder.getNo());
        BladeUser user = AuthUtil.getUser();
        repairsorderRecord.setRepairPerson(user.getNickName());
        if (repairsorder.getState().equals("2")){
            repairsorderRecord.setRemark("工单处理中");
            repairsorderRecord.setState("2");
        }else if (repairsorder.getState().equals("3")){
            repairsorderRecord.setRemark("工单已完成");
            repairsorderRecord.setState("3");
        }
        boolean saveRecord = repairsorderRecordService.save(repairsorderRecord);
        return updateRepairsorder&&saveRecord;
    }


}

 src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml

@@ -23,12 +23,12 @@

    <select id="getTaskInfoOne" resultMap="taskinfoResultMap">
        select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,
               state,source,create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo
               state,source,create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo
        where id = #{id} and is_deleted = 0
    </select>

    <select id="selectTaskInfoPage" resultMap="taskinfoResultMap">
        select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,state,source,create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo where is_deleted = 0
        select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,state,source,create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo where is_deleted = 0
        <if test="taskinfo.title != null and taskinfo.title != '' ">
            and title like concat('%',#{taskinfo.title},'%')
        </if>

 src/main/java/org/springblade/modules/taskinfo/mapper/TaskinfoPlanMapper.xml

@@ -47,7 +47,7 @@
    </select>
    <select id="getTaskInfoPlanOne" resultType="org.springblade.modules.taskinfo.entity.TaskinfoPlanEntity">
        select id,no,title,type,start_time,end_time,content,ST_ASTEXT(route_range) as route_range,
               create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo_plan
               create_user,create_time,update_user,update_time,status,create_dept,is_deleted from ins_taskinfo_plan
        where id = #{id} and is_deleted = 0
    </select>


 src/main/java/org/springblade/modules/userstatistics/controller/UserStatisticsController.java

@@ -6,6 +6,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.modules.userstatistics.service.IUserStatisticsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -26,6 +27,7 @@
@Api(value = "数据统计", tags = "数据统计接口")
public class UserStatisticsController{

    @Autowired
    private final IUserStatisticsService userStatisticsService;

    @PostMapping("/getRepairTask")

 src/main/java/org/springblade/modules/userstatistics/mapper/UserStatisticsMapper.java

@@ -1,7 +1,6 @@
package org.springblade.modules.userstatistics.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;