fix

songhuangfeng123

2022-09-20 f1f506172a3edff8d31e4db77b8940f115660919

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
@@ -10,14 +11,17 @@
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineMngQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineMngDto;
import com.gkhy.safePlatform.targetDuty.service.ExamineMngService;
import com.gkhy.safePlatform.targetDuty.service.baseService.ExamineMngBaseService;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;


/**
 * 绩效考核管理-安全考核管理(ExamineMng)表控制层
@@ -34,6 +38,10 @@
    @Resource
    private ExamineMngService examineMngService;

    @Resource
    private ExamineMngBaseService examineMngBaseService;


    /**
     * 分页查询所有数据
     *
@@ -42,7 +50,7 @@
     */
    @PostMapping(value = "/page/list")
    public ResultVO selectAll(@RequestBody PageQuery<ExamineMngQueryCriteria> pageQuery){
      PageUtils.checkCheck(pageQuery);

      return this.examineMngService.queryAll(pageQuery);
    }

@@ -66,11 +74,15 @@
     * @return 修改结果
     */
    @PostMapping(value = "/addOrUpdate")
    public ResultVO update(@RequestBody ExamineMng examineMng) {
    public ResultVO update(Authentication authentication, @RequestBody ExamineMng examineMng) {
        // 获取当前用户
/*        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        examineMng.setExamineDepartmentId(currentUser.getDepId());
        examineMng.setExaminePersonId(currentUser.getUid());*/
        if (examineMng.getId() == null) {
            return new ResultVO<>(ResultCodes.OK,examineMngService.save(examineMng));
            return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
        } else {
            examineMngService.update(examineMng,new UpdateWrapper<ExamineMng>().eq("id",examineMng.getId()));
            examineMngBaseService.update(examineMng,new UpdateWrapper<ExamineMng>().eq("id",examineMng.getId()));
            return new ResultVO<>(ResultCodes.OK);
        }
    }
@@ -81,11 +93,9 @@
     * @param ids 主键结合
     * @return 删除结果
     */
    @GetMapping(value = "/delete")
    public ResultVO delete(String ids) {
   List<String> idList = Arrays.stream(ids.split(","))
                .collect(Collectors.toList());
        this.examineMngService.removeByIds(idList);
    @RequestMapping(value = "/delete",method = RequestMethod.POST)
    public ResultVO delete(@RequestBody Long[] ids) {
        this.examineMngService.delete(ids);
        return new ResultVO<>(ResultCodes.OK);
    }

@@ -98,7 +108,7 @@
        examineTemplateSaveOrUpdate.setExamineDate(new Timestamp(new java.util.Date().getTime()));
        examineTemplateSaveOrUpdate.setExamineTotalNumber("3");
        examineTemplateSaveOrUpdate.setMemo("4");
        examineTemplateSaveOrUpdate.setExaminePersonId("5");
        examineTemplateSaveOrUpdate.setExaminePersonId(5L);
        examineTemplateSaveOrUpdate.setBeExaminedPersonId("6");
        examineTemplateSaveOrUpdate.setExamineDepartmentId(7L);
        examineTemplateSaveOrUpdate.setBeExaminedDepartmentId(8L);