待办事项加上待填制

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -294,7 +294,7 @@ public class ProvisionalPlanController extends BaseController {
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
-            String fileName = URLEncoder.encode("年度计划（模板）", "UTF-8").replaceAll("\\+", "%20");
+            String fileName = URLEncoder.encode("临时计划（模板）", "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             outputStream = response.getOutputStream();
             ExcelWriter excelWriter = EasyExcel.write(outputStream)

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -74,6 +74,7 @@ public class ProvisionalPlan {
     /**
      * 机关业务指导处(科)
      */
+    @Excel(name = "机关业务指导处(科)")
     @TableField("organ_division")
     private String organDivision;
     @TableField(exist = false)

purchase-system/src/main/java/com/ozs/plan/service/ProvisionalPlanService.java

@@ -45,7 +45,6 @@ public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
 
     /**
      * 填写采购服务站
-     *
      * @param provisionalPlanVo
      * @return
      */

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -122,7 +122,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     public String importProvisionalPlan(List<ProvisionalPlan> provisionalPlans, boolean updateSupport, LoginUser loginUser) {
         // 字典项
         HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
-        HashMap<String, String> projectTypesMap = planEnums.get("projectTypes");
+        HashMap<String, String> projectTypesMap = planEnums.get("projectTypesAds");
         HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
 
         int successNum = 0;
@@ -200,20 +200,20 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                         builder.append(projectAttributes.get(ofProvisionalPlan.getProjectAttr()));
                     }
                     ofProvisionalPlan.setProjectAttr(builder.toString());
-                    ofProvisionalPlan.setIsExcess(deptService.isExcessOrNo(ofProvisionalPlan.getProjectType(), ofProvisionalPlan.getEvaluation(), info.getDeptId()));
+                    //ofProvisionalPlan.setIsExcess(deptService.isExcessOrNo(ofProvisionalPlan.getProjectType(), ofProvisionalPlan.getEvaluation(), info.getDeptId()));
                     ofProvisionalPlan.setCreated(String.valueOf(loginUser.getUserId()));
                     ofProvisionalPlan.setCreateTime(new Date());
                     ofProvisionalPlan.setPlanType("1");
                     provisionalPlanMapper.insert(ofProvisionalPlan);
                     successNum++;
-                    successMsg.append("*" + successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入成功!");
+                    successMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入成功!");
                 } else {
                     failureNum++;
-                    failureMsg.append("*" + successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 已存在");
+                    failureMsg.append(successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 已存在；");
                 }
             } catch (Exception exc) {
                 failureNum++;
-                String msg = "*" + successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入失败";
+                String msg = successNum + "、项目 " + ofProvisionalPlan.getProjectName() + " 导入失败；";
                 failureMsg.append(msg + exc.getMessage());
                 log.error(msg, exc);
             }

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -3977,7 +3977,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public List<PmDemand> getListByStatus(String projectStatus) {
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
         //需求待提交时不用查审核
-        if (!projectStatus.equals("5")) {
+        if (!projectStatus.equals("5") && !projectStatus.equals("4")) {
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
             l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());