目标fix

songhuangfeng123

2022-09-08 bfb4c1e1d4e3f99f74a51ef5b67531f9d91d0dde

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

@@ -12,6 +12,7 @@
import com.gkhy.safePlatform.targetDuty.model.dto.resp.RewardPunishmentDetailDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.RewardPunishmentDetailExcel;
import com.gkhy.safePlatform.targetDuty.service.RewardPunishmentDetailService;
import com.gkhy.safePlatform.targetDuty.service.baseService.RewardPunishmentDetailBaseService;
import com.gkhy.safePlatform.targetDuty.utils.DateUtils;
import com.gkhy.safePlatform.targetDuty.utils.poihelper.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,11 +47,11 @@
    @Resource
    private RewardPunishmentDetailService rewardPunishmentDetailService;

    @Resource
    private RewardPunishmentDetailBaseService rewardPunishmentDetailBaseService;
    @Autowired
    public HttpServletRequest request;

    @Autowired
    public HttpServletResponse response;

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

      return this.rewardPunishmentDetailService.queryAll(pageQuery);
    }
   
@@ -103,9 +104,9 @@
//        });
        if (rewardPunishmentDetail.getId() == null) {
            rewardPunishmentDetail.setCreateTime(new Date());
            return new ResultVO<>(ResultCodes.OK,rewardPunishmentDetailService.save(rewardPunishmentDetail));
            return new ResultVO<>(ResultCodes.OK,rewardPunishmentDetailBaseService.save(rewardPunishmentDetail));
        } else {
            rewardPunishmentDetailService.updateById(rewardPunishmentDetail);
            rewardPunishmentDetailBaseService.updateById(rewardPunishmentDetail);
            return new ResultVO<>(ResultCodes.OK);
        }
    }
@@ -118,19 +119,7 @@
     */
    @RequestMapping(value = "/delete",method = RequestMethod.POST)
    public ResultVO delete(@RequestBody Long[] ids) {
        if(ids == null){
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);

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

@@ -142,24 +131,7 @@
     */
    @GetMapping(value = "/exportData")
    public void exportData(RewardPunishmentDetailQueryCriteria queryCriteria) throws IOException {
        Map<String,String> map = new LinkedHashMap<>();
        map.put("1","奖惩日期");
        map.put("2","奖惩类型");
        map.put("3","被奖惩者");
        map.put("4","奖惩内容");
        map.put("5","奖惩依据");

        String key = DateUtils.date2String(new Date(), DateUtils.PATTERN_ALLTIME_NOSIGN) ;
        String fileName = URLEncoder.encode("奖惩记录"+key+".xls", "UTF-8");
        response.setContentType("application/vnd.ms-excel");
        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");


        List<RewardPunishmentDetailExcel> respList = BeanCopyUtils.copyBeanList(rewardPunishmentDetailService.queryAllRelation(queryCriteria), RewardPunishmentDetailExcel.class);

        ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
        response.getOutputStream().close();
        rewardPunishmentDetailService.exportData(queryCriteria);
    }

}