feat(module-datafill): 添加部门类型字段并实现运营周报补充填报批量保存功能

- 在 FCustomReportDatasetServiceImpl 中添加部门类型字段
- 在 WeekReportRemarkController 中添加运营周报补充填报批量保存接口

@@ -572,6 +572,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		SysDepart dataDepart = departService.getById(departId);
 		SysDepart dataDepart = departService.getById(departId);
 		map.put("departId", departId);
 		map.put("departId", departId);
 		map.put("departName", dataDepart.getDepartName());
 		map.put("departName", dataDepart.getDepartName());
+		map.put("departType", dataDepart.getDepartType());
 		QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<>();
 		queryWrapper.in("id", Arrays.asList(departs.split(",")));
 		queryWrapper.in("id", Arrays.asList(departs.split(",")));
 		queryWrapper.orderByAsc("depart_order");
 		queryWrapper.orderByAsc("depart_order");
@@ -580,6 +581,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 			Map<String, Object> departMap = new HashMap<>();
 			Map<String, Object> departMap = new HashMap<>();
 			departMap.put("departId", depart.getId());
 			departMap.put("departId", depart.getId());
 			departMap.put("departName", depart.getDepartName());
 			departMap.put("departName", depart.getDepartName());
+			departMap.put("departType", depart.getDepartType());
 			List<DepartWeekReportVO> list = new ArrayList<>();
 			List<DepartWeekReportVO> list = new ArrayList<>();
 			List<DepartWeekReportVO> hbList = new ArrayList<>();
 			List<DepartWeekReportVO> hbList = new ArrayList<>();
 			String departIds = departService.getChildDepartId(depart.getId());
 			String departIds = departService.getChildDepartId(depart.getId());

@@ -8,12 +8,17 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 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.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.context.BaseContextHandler;
 import com.skua.core.query.QueryGenerator;
 import com.skua.core.query.QueryGenerator;
 import com.skua.core.service.ISequenceService;
 import com.skua.core.service.ISequenceService;
 import com.skua.core.util.ConvertUtils;
 import com.skua.core.util.ConvertUtils;
+import com.skua.modules.process.entity.FProcessNode;
+import com.skua.modules.report.entity.FReportHeaderConfig;
 import com.skua.modules.report.entity.WeekReportRemark;
 import com.skua.modules.report.entity.WeekReportRemark;
 import com.skua.modules.report.service.IWeekReportRemarkService;
 import com.skua.modules.report.service.IWeekReportRemarkService;
 import java.util.Date;
 import java.util.Date;
@@ -107,6 +112,27 @@ public class WeekReportRemarkController {
 		return result;
 		return result;
 	}
 	}
 
 
+	@AutoLog(value = "运营周报补充填报批量保存")
+	@ApiOperation(value="运营周报补充填报批量保存", notes="运营周报补充填报批量保存")
+	@PostMapping(value = "/saveBatch")
+	public Result<Object> saveBatch(@RequestBody JSONObject jsonObject) {
+		Result<Object> result = new Result<Object>();
+		JSONArray array = jsonObject.getJSONArray("list");
+		List<WeekReportRemark> list = JSONObject.parseArray(array.toJSONString(), WeekReportRemark.class);
+		for(WeekReportRemark weekReportRemark : list){
+			WeekReportRemark remark = weekReportRemarkService.getInfoByDepartId(weekReportRemark.getMonthWeek(),weekReportRemark.getDepartId());
+			if(remark!=null){
+				weekReportRemark.setId(remark.getId());
+				weekReportRemarkService.updateById(weekReportRemark);
+			}else{
+				weekReportRemarkService.save(weekReportRemark);
+			}
+		}
+		result.setSuccess(true);
+		result.setResult("保存成功");
+		return result;
+	}
+
 	/**
 	/**
 	 * <pre>
 	 * <pre>
 	 * 	添加
 	 * 	添加