From a01fb1b3f0a9cfaf0ed453119b850b5ff941ae9c Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Thu, 21 Dec 2023 17:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BPlanEnterpriseController.java |  9 ++++---
 .../entity/BPlanEnterprise.java               |  3 +++
 .../mapper/BPlanEnterpriseMapper.java         |  9 ++++++-
 .../service/BPlanEnterpriseService.java       |  8 +++++-
 .../impl/BPlanEnterpriseServiceImpl.java      |  7 ++++-
 .../mapper/yingji/BPlanEnterpriseMapper.xml   | 27 +++++++++++++++++++
 6 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java
index ffe0312..18518be 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java
@@ -4,6 +4,7 @@ package com.ruoyi.programManagement.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.programManagement.entity.BPlanEnterprise;
 import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest;
@@ -125,14 +126,14 @@ public class BPlanEnterpriseController extends BaseController {
     /**
      * 修改数据
      *
-     * @param bPlanEnterprise 实体对象
+     * @param req 实体对象
      * @return 修改结果
      */
     @PutMapping
     @ApiOperation(value = "修改计划企业表")
-    public AjaxResult update(@RequestBody BPlanEnterpriseRequest bPlanEnterprise) {
-
-        return success(bPlanEnterpriseService.updateById(bPlanEnterprise));
+    public AjaxResult update(@RequestBody BPlanEnterpriseRequest req) {
+        bPlanEnterpriseService.updatePlan(req);
+        return success();
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java
index 6c14f35..d220540 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java
@@ -114,6 +114,9 @@ public class BPlanEnterprise extends BaseEntity {
     @ApiModelProperty(value = "计划月份")
     private String[] plannedMonth;
 
+    @TableField(javaType = true)
+    private String plannedMonthStr;
+
 
     /**
      * 行政区划
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java
index 6703d4c..5cecb3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
  * @author wu
  * @since 2023-09-07 09:43:06
  */
-public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterpriseRequest> {
+public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
 
 
     /**
@@ -113,5 +113,12 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterpriseRequest
      */
     void insertPlan(BPlanEnterpriseRequest bPlanEnterprise);
 
+
+    /**
+     * 新增
+     * @param bPlanEnterprise
+     */
+    void updatePlan(BPlanEnterpriseRequest bPlanEnterprise);
+
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java
index fd09913..6d50fc6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java
@@ -17,7 +17,7 @@ import java.util.Map;
  * @author wu
  * @since 2023-09-07 09:43:06
  */
-public interface BPlanEnterpriseService extends IService<BPlanEnterpriseRequest> {
+public interface BPlanEnterpriseService extends IService<BPlanEnterprise> {
 
 
 
@@ -107,5 +107,11 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterpriseRequest>
      * @param bPlanEnterprise
      */
     void insert(BPlanEnterpriseRequest bPlanEnterprise);
+
+    /**
+     * 新增
+     * @param bPlanEnterprise
+     */
+    void updatePlan(BPlanEnterpriseRequest bPlanEnterprise);
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java
index 6a5a68c..5da7f04 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * @since 2023-09-07 09:43:07
  */
 @Service("bPlanEnterpriseService")
-public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMapper, BPlanEnterpriseRequest> implements BPlanEnterpriseService {
+public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMapper, BPlanEnterprise> implements BPlanEnterpriseService {
     @Resource
     private BPlanEnterpriseMapper bPlanEnterpriseMapper;
 
@@ -111,6 +111,11 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
         bPlanEnterpriseMapper.insertPlan(bPlanEnterprise);
     }
 
+    @Override
+    public void updatePlan(BPlanEnterpriseRequest bPlanEnterprise) {
+        bPlanEnterpriseMapper.updatePlan(bPlanEnterprise);
+    }
+
 
 }
 
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
index 835fb98..d8bc06d 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
@@ -326,6 +326,33 @@
         </foreach>
 
     </update>
+    <update id="updatePlan" parameterType="BPlanEnterpriseRequest">
+        update b_plan_enterprise
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id=#{enterpriseId},</if>
+            <if test="district != null">district=#{district},</if>
+            <if test="plannedYear != null">planned_year={plannedYear},</if>
+            <if test="isPoint != null">is_point=#{isPoint},</if>
+            <if test="enterpriseName != null">enterprise_name=#{enterpriseName},</if>
+            <if test="lawSort != null">law_sort=#{law_sort},</if>
+            <if test="lawAreas != null">law_areas=#{lawAreas},</if>
+            <if test="lawLevel != null">law_level=#{lawLevel},</if>
+            <if test="lawHierarchy != null">law_hierarchy=#{lawHierarchy},</if>
+            <if test="plannedMonth != null">planned_month=#{plannedMonth},</if>
+            <if test="status != null">status=#{status},</if>
+            <if test="createId != null">create_id=#{createId},</if>
+            <if test="createBy != null">create_by=#{createBy},</if>
+            <if test="createTime != null">create_time=#{createTime},</if>
+            <if test="updateId != null">update_id=#{updateId},</if>
+            <if test="updateBy != null">update_by=#{updateBy},</if>
+            <if test="updateTime != null">update_time=#{updateTime},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="userId != null">user_id=#{userId},</if>
+            <if test="deptId != null">dept_id=#{deptId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
 
 
     <insert id="insertPlan" parameterType="BPlanEnterpriseRequest" useGeneratedKeys="true" keyProperty="id">