Merge remote-tracking branch 'origin/master'

+package com.skua.modules.report.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.report.entity.FReportHeaderConfig;
+import com.skua.modules.report.entity.FReportItem;
+import com.skua.modules.report.service.IFReportHeaderConfigService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.skua.modules.report.service.IFReportItemService;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 填报报表表头配置
+ * </pre>
+ * @author zhanglei
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags="填报报表表头配置")
+@RestController
+@RequestMapping("/report/headerConfig")
+public class FReportHeaderConfigController {
+	@Autowired
+	private IFReportHeaderConfigService fReportHeaderConfigService;
+	@Autowired
+	private IFReportItemService fReportItemService;
+
+	/**
+	 * <pre>
+	 * 	分页列表查询
+	 * </pre>
+	 * @param fReportHeaderConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+	@AutoLog(value = "填报报表表头配置-分页列表查询")
+	@ApiOperation(value="填报报表表头配置-分页列表查询", notes="填报报表表头配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<FReportHeaderConfig>> queryPageList(FReportHeaderConfig fReportHeaderConfig,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FReportHeaderConfig>> result = new Result<IPage<FReportHeaderConfig>>();
+		QueryWrapper<FReportHeaderConfig> queryWrapper = QueryGenerator.initQueryWrapper(fReportHeaderConfig, req.getParameterMap());
+		Page<FReportHeaderConfig> page = new Page<FReportHeaderConfig>(pageNo, pageSize);
+		IPage<FReportHeaderConfig> pageList = fReportHeaderConfigService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	 * <pre>
+	 * 	添加
+	 * </pre>
+	 * @param fReportHeaderConfig
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "填报报表表头配置-添加")
+	@ApiOperation(value="填报报表表头配置-添加", notes="填报报表表头配置-添加")
+	@PostMapping(value = "/add")
+	public Result<FReportHeaderConfig> add(@RequestBody FReportHeaderConfig fReportHeaderConfig) {
+		Result<FReportHeaderConfig> result = new Result<FReportHeaderConfig>();
+		try {
+			fReportHeaderConfigService.save(fReportHeaderConfig);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	 * <pre>
+	 * 	 编辑
+	 * </pre>
+	 * @param fReportHeaderConfig
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "填报报表表头配置-编辑")
+	@ApiOperation(value="填报报表表头配置-编辑", notes="填报报表表头配置-编辑")
+	@PutMapping(value = "/edit")
+	public Result<FReportHeaderConfig> edit(@RequestBody FReportHeaderConfig fReportHeaderConfig) {
+		Result<FReportHeaderConfig> result = new Result<FReportHeaderConfig>();
+		FReportHeaderConfig fReportHeaderConfigEntity = fReportHeaderConfigService.getById(fReportHeaderConfig.getId());
+		if(fReportHeaderConfigEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fReportHeaderConfigService.updateById(fReportHeaderConfig);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+
+		return result;
+	}
+
+	@AutoLog(value = "报表数据项值-配置")
+	@ApiOperation(value="报表数据项值-配置", notes="报表数据项值-配置")
+	@PostMapping(value = "/save")
+	public Result<List<FReportHeaderConfig>> save(@RequestBody JSONObject jsonObject) {
+		Result<List<FReportHeaderConfig>> result = new Result<List<FReportHeaderConfig>>();
+		JSONArray array = jsonObject.getJSONArray("list");
+		String reportId = jsonObject.getString("reportId");
+		String departId = jsonObject.getString("departId");
+		List<FReportHeaderConfig> list = JSONObject.parseArray(array.toJSONString(), FReportHeaderConfig.class);
+		if(list.size()>0){
+			List<FReportHeaderConfig> configList = new ArrayList<>();
+			fReportHeaderConfigService.deleteHeaderConfig(reportId,departId);
+			for (FReportHeaderConfig config : list) {
+				config.setDepartId(departId);
+				config.setReportId(reportId);
+				configList.add(config);
+			}
+			fReportHeaderConfigService.saveBatch(configList);
+		}
+		return result;
+	}
+
+	@AutoLog(value = "填报报表表头配置-获取表头配置")
+	@ApiOperation(value="填报报表表头配置-获取表头配置", notes="填报报表表头配置-获取表头配置")
+	@GetMapping(value = "/get")
+	public Result<List<FReportHeaderConfig>> queryConfigList(FReportHeaderConfig fReportHeaderConfig) {
+		Result<List<FReportHeaderConfig>> result = new Result<List<FReportHeaderConfig>>();
+		List<FReportHeaderConfig> list = new ArrayList<>();
+		QueryWrapper<FReportHeaderConfig> queryWrapper = new QueryWrapper<>();
+		if(ConvertUtils.isNotEmpty(fReportHeaderConfig.getDepartId())
+				&&ConvertUtils.isNotEmpty(fReportHeaderConfig.getReportId())){
+			queryWrapper.in("depart_id", fReportHeaderConfig.getDepartId());
+			queryWrapper.in("report_id", fReportHeaderConfig.getReportId());
+			queryWrapper.orderByAsc("sort_num");
+			list = fReportHeaderConfigService.list(queryWrapper);
+			if(list.size() == 0){
+				List<FReportItem> itemList = fReportItemService.getListByReportId(fReportHeaderConfig.getReportId());
+				for (FReportItem reportItem : itemList) {
+					FReportHeaderConfig config = new FReportHeaderConfig();
+					config.setReportId(fReportHeaderConfig.getReportId());
+					config.setDepartId(fReportHeaderConfig.getDepartId());
+					config.setItemCode(reportItem.getItemCode());
+					config.setItemName(reportItem.getItemAlias());
+					config.setSortNum(reportItem.getSortNum());
+					list.add(config);
+				}
+			}
+			result.setSuccess(true);
+		}else{
+			result.setSuccess(false);
+		}
+		result.setResult(list);
+		return result;
+	}
+
+	/**
+	 * <pre>
+	 * 	 通过id删除
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "填报报表表头配置-通过id删除")
+	@ApiOperation(value="填报报表表头配置-通过id删除", notes="填报报表表头配置-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			fReportHeaderConfigService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+	/**
+	 * <pre>
+	 * 	  批量删除
+	 * </pre>
+	 * @param ids
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "填报报表表头配置-批量删除")
+	@ApiOperation(value="填报报表表头配置-批量删除", notes="填报报表表头配置-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FReportHeaderConfig> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FReportHeaderConfig> result = new Result<FReportHeaderConfig>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fReportHeaderConfigService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	/**
+	 * <pre>
+	 * 	 通过id查询
+	 * </pre>
+	 * @param id
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+	@AutoLog(value = "填报报表表头配置-通过id查询")
+	@ApiOperation(value="填报报表表头配置-通过id查询", notes="填报报表表头配置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<FReportHeaderConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FReportHeaderConfig> result = new Result<FReportHeaderConfig>();
+		FReportHeaderConfig fReportHeaderConfig = fReportHeaderConfigService.getById(id);
+		if(fReportHeaderConfig==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fReportHeaderConfig);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+   /**
+	 * <pre>
+	 * 	 导出excel
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FReportHeaderConfig> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (ConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FReportHeaderConfig fReportHeaderConfig = JSON.parseObject(deString, FReportHeaderConfig.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fReportHeaderConfig, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FReportHeaderConfig> pageList = fReportHeaderConfigService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "填报报表表头配置列表");
+      mv.addObject(NormalExcelConstants.CLASS, FReportHeaderConfig.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("填报报表表头配置列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+   /**
+	 * <pre>
+	 * 	 通过excel导入数据
+	 * </pre>
+	 * @param request
+	 * @param response
+	 * @return
+	 * @author 开发者姓名, 开发时间
+	 * @Description: TODO(这里描述这个方法的需求变更情况)
+	 */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FReportHeaderConfig> listFReportHeaderConfigs = ExcelImportUtil.importExcel(file.getInputStream(), FReportHeaderConfig.class, params);
+              fReportHeaderConfigService.saveBatch(listFReportHeaderConfigs);
+              return Result.ok("文件导入成功！数据行数:" + listFReportHeaderConfigs.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

+package com.skua.modules.report.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 填报表头配置
+ */
+@Data
+@TableName("f_report_header_config")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="f_report_header_config对象", description="填报表头配置")
+public class FReportHeaderConfig {
+
+	/**主键id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "主键id")
+	private String id;
+	/**报表id*/
+	@Excel(name = "报表id", width = 15)
+    @ApiModelProperty(value = "报表id")
+	private String reportId;
+	/**数据项名称*/
+	@Excel(name = "数据项名称", width = 15)
+    @ApiModelProperty(value = "数据项名称")
+	private String itemCode;
+	/**排序序号*/
+	@Excel(name = "排序序号", width = 15)
+    @ApiModelProperty(value = "排序序号")
+	private Integer sortNum;
+	/**所属厂区*/
+	@Excel(name = "所属厂区", width = 15)
+    @ApiModelProperty(value = "所属厂区")
+	private String departId;
+	/**创建人Id*/
+	@Excel(name = "创建人Id", width = 15)
+    @ApiModelProperty(value = "创建人Id")
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**修改人Id*/
+	@Excel(name = "修改人Id", width = 15)
+    @ApiModelProperty(value = "修改人Id")
+	private String updateBy;
+	/**修改时间*/
+	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**删除标识*/
+	@Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+	private Integer delFlag;
+
+	@TableField(exist=false)
+	private String itemName;
+}

+package com.skua.modules.report.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.report.entity.FReportHeaderConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 填报表头配置
+ */
+public interface FReportHeaderConfigMapper extends BaseMapper<FReportHeaderConfig> {
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.report.mapper.FReportHeaderConfigMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.report.service;
+
+import com.skua.modules.report.entity.FReportHeaderConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 填报表头配置
+ */
+public interface IFReportHeaderConfigService extends IService<FReportHeaderConfig> {
+
+    void deleteHeaderConfig(String reportId, String departId);
+
+}

+package com.skua.modules.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.report.entity.FReportHeaderConfig;
+import com.skua.modules.report.mapper.FReportHeaderConfigMapper;
+import com.skua.modules.report.service.IFReportHeaderConfigService;
+import com.skua.modules.system.datestandard.entity.SysStructDict;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 填报表头配置
+ */
+@Service
+public class FReportHeaderConfigServiceImpl extends ServiceImpl<FReportHeaderConfigMapper, FReportHeaderConfig> implements IFReportHeaderConfigService {
+
+    @Autowired
+    private FReportHeaderConfigMapper reportHeaderConfigMapper;
+
+    @Override
+    public void deleteHeaderConfig(String reportId, String departId) {
+        List<String> idList = new ArrayList<>();
+        LambdaQueryWrapper<FReportHeaderConfig> queryWrapper = new LambdaQueryWrapper<FReportHeaderConfig>();
+        queryWrapper.eq(FReportHeaderConfig::getDepartId, departId);
+        queryWrapper.eq(FReportHeaderConfig::getReportId, reportId);
+        List<FReportHeaderConfig> list = reportHeaderConfigMapper.selectList(queryWrapper);
+        if(list.size() > 0){
+            for (FReportHeaderConfig config : list) {
+                if(ConvertUtils.isNotEmpty(config.getId())){
+                    idList.add(config.getId());
+                }
+            }
+            reportHeaderConfigMapper.deleteBatchIds(idList);
+        }
+    }
+}