临时计划新增和修改添加附件上传

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -11,15 +11,15 @@ import java.util.List;
 
 @Mapper
 public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
-    int deleteProvisionalPlanById(@Param("planPracticalId") Integer planPracticalId);
+    int deleteProvisionalPlanById(@Param("planPracticalId") Long planPracticalId);
 
     int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan);
 
     List<ProvisionalPlan> selectProjectName(String projectName);
 
-    int commitProvisionalPlan(Integer planPracticalId);
+    int commitProvisionalPlan(Long planPracticalId);
 
-    ProvisionalPlan seletById(Integer planPracticalId);
+    ProvisionalPlan seletById(Long planPracticalId);
 
     List<ProvisionalPlan> selectProvisionalPlan(ProvisionalPlanVo provisionalPlanVo);
 

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

@@ -12,7 +12,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
-    int deleteProvisionalPlanById(Integer planPracticalId);
+    int deleteProvisionalPlanById(Long planPracticalId);
+
 
     int updateProvisionalPlanById(ProvisionalPlanVo provisionalPlan);
 
@@ -22,7 +23,7 @@ public interface ProvisionalPlanService extends IService<ProvisionalPlan> {
 
     int commitProvisionalPlan(ProvisionalPlanVo provisionalPlanVo);
 
-    AjaxResult seletById(Integer planPracticalId);
+    AjaxResult seletById(Long planPracticalId);
 
     AjaxResult selectProvisionalPlan(ProvisionalPlanVo provisionalPlanVo, HttpServletRequest request, LoginUser loginUser);
 

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

@@ -73,7 +73,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     private IPmDemandService demandService;
 
     @Override
-    public int deleteProvisionalPlanById(Integer planPracticalId) {
+    public int deleteProvisionalPlanById(Long planPracticalId) {
         return provisionalPlanMapper.deleteProvisionalPlanById(planPracticalId);
     }
 
@@ -249,7 +249,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     }
 
     @Override
-    public AjaxResult seletById(Integer planPracticalId) {
+    public AjaxResult seletById(Long planPracticalId) {
         ProvisionalPlan provisionalPlan = provisionalPlanMapper.seletById(planPracticalId);
         if (StringUtils.isNull(provisionalPlan)) {
             return AjaxResult.error("数据查询失败");
@@ -441,7 +441,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             BeanUtils.copyProperties(byId, ofYears);
             ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             planYearsMapper.insertPlanYears(ofYears);
-            byId.setPlanYearId(ofYears.getPlanYearId().intValue());
+            byId.setPlanYearId(ofYears.getPlanYearId());
         }
         PmDemand demand = new PmDemand();
         BeanUtils.copyProperties(byId, demand);

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -174,7 +174,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
      * @param planId
      * @return
      */
-    PmDemand selectByPlanId(@Param("planId") Integer planId);
+    PmDemand selectByPlanId(@Param("planId") Long planId);
 
     /**
      * 项目执行进度统计--正常推进项目数量、预算金额

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

@@ -300,10 +300,11 @@ public interface IPmDemandService extends IService<PmDemand> {
 
     /**
      * 通过计划ID查询项目
+     *
      * @param planId
      * @return
      */
-    PmDemand selectByPlanId(Integer planId);
+    PmDemand selectByPlanId(Long planId);
 
     /**
      * 采购项目--项目数量分析

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

@@ -1865,7 +1865,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
      * @return
      */
     @Override
-    public PmDemand selectByPlanId(Integer planId) {
+    public PmDemand selectByPlanId(Long planId) {
         return pmDemandMapper.selectByPlanId(planId);
     }
 

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

@@ -31,7 +31,7 @@
         <result property="update_time" column="updateTime"/>
     </resultMap>
 
-    <delete id="deleteProvisionalPlanById" parameterType="java.lang.Integer">
+    <delete id="deleteProvisionalPlanById" parameterType="java.lang.Long">
         delete
         from plan_practical
         where plan_practical_id = #{planPracticalId}
@@ -112,14 +112,14 @@
           and plan_type = "1"
     </select>
 
-    <update id="commitProvisionalPlan" parameterType="java.lang.Integer">
+    <update id="commitProvisionalPlan" parameterType="java.lang.Long">
         update plan_practical
         set project_status = 1
         where plan_type = 1
           and plan_practical_id = #{planPracticalId}
     </update>
 
-    <select id="seletById" resultType="com.ozs.plan.doman.ProvisionalPlan" parameterType="java.lang.Integer">
+    <select id="seletById" resultType="com.ozs.plan.doman.ProvisionalPlan" parameterType="java.lang.Long">
         select *
         from plan_practical
         where plan_type = 1

purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -198,11 +198,10 @@
         GROUP BY project_status
     </select>
 
-    <select id="selectByPlanId" parameterType="java.lang.Integer" resultType="com.ozs.pm.doman.PmDemand">
+    <select id="selectByPlanId" parameterType="java.lang.Long" resultType="com.ozs.pm.doman.PmDemand">
         select *
         from pm_demand
-        where plan_id = #{planId}
-        limit 1
+        where plan_id = #{planId} limit 1
     </select>
 
     <select id="countMajorProjectLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">