DeBugDeBugDeBug

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

@@ -123,13 +123,6 @@ public interface PlanYearsService extends IService<PlanYears> {
      */
     AjaxResult upLoadPlanFile(PlanYearsStandardVo yearsStandardVo);
 
-    /**
-     * 下载计划关联文件
-     *
-     * @param yearsStandardVo 年度计划
-     * @return 结果
-     */
-    AjaxResult downLoadPlanFile(PlanYearsStandardVo yearsStandardVo);
 
     /**
      * 需求单位首页计划管理总数

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

@@ -540,12 +540,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success();
     }
 
-    @Override
-    public AjaxResult downLoadPlanFile(PlanYearsStandardVo yearsStandardVo) {
-
-        return AjaxResult.success();
-    }
-
     /**
      * 需求单位--首页--计划管理总数
      *
@@ -588,27 +582,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Override
     public AjaxResult purchasingManagementPurchasingManagementTotal() {
-//        List<PlanYears> planYears = new ArrayList<>();
-//        try {
-//            List<SysRole> sysRoles = sysRoleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
-//            List<SysRole> sysRoleList = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("purchasing_management")).collect(Collectors.toList());
-//            if (sysRoleList.size() > 0) {
-//                SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
-//                SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
-//                LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
-//                queryWrapper.eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
-//                        .in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
-//                planYears = planYearsMapper.selectList(queryWrapper);
-//            }
-//            List<SysRole> sysRoleList2 = sysRoles.stream().filter(tdto -> tdto.getRoleKey().equals("admin")).collect(Collectors.toList());
-//            if (sysRoleList2.size() > 0) {
-//                LambdaQueryWrapper<PlanYears> queryWrapper = new LambdaQueryWrapper<>();
-//                queryWrapper.in(PlanYears::getProjectStatus, ProjectStatus.PLANWAIEXAMINE.getCode(), ProjectStatus.PLANTOEXAMINE.getCode());
-//                planYears = planYearsMapper.selectList(queryWrapper);
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         PlanYearsStandardVo vo = new PlanYearsStandardVo();
         vo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));

purchase-system/src/main/resources/mapper/plan/PlanQuarterMapper.xml

@@ -67,10 +67,10 @@
             <if test="projectStatus != null and projectStatus != ''">
                 AND project_status = #{projectStatus}
             </if>
-            <if test="params.beginTime != null "><!-- 开始时间检索 -->
+            <if test="params!= null and params.beginTime!= null "><!-- 开始时间检索 -->
                 and date_format(p.plan_demand_sub_time,'%y%m') &gt;= date_format(#{params.beginTime},'%y%m')
             </if>
-            <if test="params.endTime != null "><!-- 结束时间检索 -->
+            <if test="params!= null and params.endTime!= null "><!-- 结束时间检索 -->
                 and date_format(p.plan_demand_sub_time,'%y%m') &lt;= date_format(#{params.endTime},'%y%m')
             </if>
             and plan_type=0
@@ -98,10 +98,10 @@
             <if test="projectStatus != null and projectStatus != ''">
                 AND project_status = #{projectStatus}
             </if>
-            <if test="params.beginTime != null "><!-- 开始时间检索 -->
+            <if test="params!= null and params.beginTime!= null "><!-- 开始时间检索 -->
                 and date_format(plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
-            <if test="params.endTime != null "><!-- 结束时间检索 -->
+            <if test="params!= null and params.endTime!= null "><!-- 结束时间检索 -->
                 and date_format(plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
             and plan_type=0
@@ -160,10 +160,10 @@
             <if test="projectStatus != null and projectStatus != ''">
                 AND p.project_status = #{projectStatus}
             </if>
-            <if test="params.beginTime != null "><!-- 开始时间检索 -->
+            <if test="params!= null and params.beginTime!= null "><!-- 开始时间检索 -->
                 and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
-            <if test="params.endTime != null "><!-- 结束时间检索 -->
+            <if test="params!= null and params.endTime!= null "><!-- 结束时间检索 -->
                 and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
             and p.del_flay=0

purchase-system/src/main/resources/mapper/plan/PlanYearsMapper.xml

@@ -119,10 +119,10 @@
 			<if test="projectStatus != null and projectStatus != ''">
 				AND p.project_status = #{projectStatus}
 			</if>
-			<if test="params.beginTime!= null "><!-- 开始时间检索 -->
+			<if test="params!= null and params.beginTime!= null "><!-- 开始时间检索 -->
 				and p.plan_demand_sub_time &gt;= #{params.beginTime}
 			</if>
-			<if test="params.endTime!= null "><!-- 结束时间检索 -->
+			<if test="params!= null and params.endTime!= null "><!-- 结束时间检索 -->
 				and p.plan_demand_sub_time &lt;= #{params.endTime}
 			</if>
 			and p.del_flay=0

purchase-system/src/main/resources/mapper/plan/ProvisionalPlanMapper.xml

@@ -226,10 +226,10 @@
             <if test="projectStatus != null and projectStatus != ''">
                 AND p.project_status = #{projectStatus}
             </if>
-            <if test="params.beginTime != null "><!-- 开始时间检索 -->
+            <if test="params!= null and params.beginTime!= null "><!-- 开始时间检索 -->
                 and date_format(p.plan_demand_sub_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
-            <if test="params.endTime != null "><!-- 结束时间检索 -->
+            <if test="params!= null and params.beginTime!= null "><!-- 结束时间检索 -->
                 and date_format(p.plan_demand_sub_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
             and p.del_flay=0