Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-02 fabd08d87d00bfdf1aacf473fd905fdd3c903ed3

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java

@@ -9,6 +9,7 @@
import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.targetDuty.entity.ExamineMng;
import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDutyWorkApproveDto;
import com.gkhy.safePlatform.targetDuty.service.TargetDutyWorkApproveService;
import com.gkhy.safePlatform.targetDuty.utils.DateUtils;
import org.springframework.security.core.Authentication;
@@ -20,6 +21,7 @@
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria;

import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.stream.Collectors;
@@ -63,7 +65,8 @@
     */
    @GetMapping(value = "/selectOne/{id}")
    public ResultVO selectOne(@PathVariable Serializable id) {
        return new ResultVO<>(ResultCodes.OK,this.targetDutyWorkApproveService.getById(id));
        TargetDutyWorkApproveDto dto = this.targetDutyWorkApproveService.selectOne(id);
        return new ResultVO<>(ResultCodes.OK,dto);
    }

   /**
@@ -106,7 +109,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.targetDutyWorkApproveService.removeByIds(idList);

        List<TargetDutyWorkApprove> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetDutyWorkApprove info = new TargetDutyWorkApprove();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetDutyWorkApproveService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }