linwe
2024-02-02 d13296506f0924eda2eb58e7f2711f3ab6169a9f
任务状态设置
7 files modified
20 ■■■■■ changed files
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/ITaskService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java 4 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -99,7 +99,7 @@
                        // 保存任务表
                        ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
                        Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
                            "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT);
                            "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT,4);
                        if (aLong > 0) {
                            // 保存任务详情表
                            ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
@@ -107,6 +107,7 @@
                            copy.setTaskId(aLong);
                            copy.setPlaceCheckId(placeCheck.getId());
                            copy.setId(null);
                            copy.setStatus(4);
                            bean1.save(copy);
                        }
                    }
src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -49,7 +49,7 @@
     * @param createUser
     * @return
     */
    Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode,Integer reportType);
    Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode,Integer reportType,Integer status);
    /**
     * @param type
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
@@ -57,7 +57,7 @@
            1, bailReporting.getApplyName(),
            AuthUtil.getUserId(),
            bailReporting.getHouseCode(),
            bailReporting.getReportType());
            bailReporting.getReportType(),0);
        if (aLong > 0) {
            bailReporting.setTaskId(aLong);
            bailReporting.setCheckUserId(AuthUtil.getUserId());
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -66,7 +66,8 @@
     */
    @Override
    public Boolean saveCampusReporting(TaskCampusReportingEventDTO reporting) {
        Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "", AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType());
        Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "",
            AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType(),0);
        if (aLong > 0) {
            // 通过houseCode 获取场所id
            QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
@@ -68,7 +68,8 @@
            taskHotelReporting.setReportType(7);
            name = DictConstant.FIRE_CHECK;
        }
        Long aLong = taskService.saveTask(2, name, 1, "", AuthUtil.getUserId(), taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType());
        Long aLong = taskService.saveTask(2, name, 1, "", AuthUtil.getUserId(),
            taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType(),0);
        if (aLong > 0) {
            // 通过houseCode 获取场所id
            QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -75,7 +75,8 @@
            default:
                name = "";
        }
        Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType());
        Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),
            taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType(),0);
        if (aLong > 0) {
            // 通过houseCode 获取场所id
            QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -145,7 +145,8 @@
     * @return
     */
    @Override
    public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode, Integer reportType) {
    public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,
                         String houseCode, Integer reportType,Integer status) {
        TaskEntity taskEntity = new TaskEntity();
        taskEntity.setType(type);
        taskEntity.setName(name);
@@ -155,6 +156,7 @@
        taskEntity.setCreateUser(createUser);
        taskEntity.setHouseCode(houseCode);
        taskEntity.setReportType(reportType);
        taskEntity.setStatus(status);
        return baseMapper.insert(taskEntity) > 0 ? taskEntity.getId() : 0;
    }