Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

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;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -125,14 +127,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();
     }
 
     /**
@@ -197,9 +199,10 @@ public class BPlanEnterpriseController extends BaseController {
     /**
      * 批量更新状态
      */
-    @ApiOperation(value = "查看计划明细")
-    @PostMapping("/updateIdList")
-    public AjaxResult updateIdList(String[] idList) {
+    @ApiOperation(value = "批量更新状态")
+    @GetMapping("/updateIdList")
+    public AjaxResult updateIdList(@RequestParam("idListStr") String idListStr) {
+        List<String> idList = Arrays.asList(idListStr.split(","));
         bPlanEnterpriseService.updateIdList(idList);
         return AjaxResult.success();
     }

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;
+
 
     /**
      * 行政区划

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> {
 
 
     /**
@@ -104,7 +104,7 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterpriseRequest
      * 批量更新状态
      * @param idList
      */
-    void updateIdList(String[] idList);
+    void updateIdList(List<String>  idList);
 
 
     /**
@@ -113,5 +113,12 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterpriseRequest
      */
     void insertPlan(BPlanEnterpriseRequest bPlanEnterprise);
 
+
+    /**
+     * 新增
+     * @param bPlanEnterprise
+     */
+    void updatePlan(BPlanEnterpriseRequest bPlanEnterprise);
+
 }
 

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> {
 
 
 
@@ -99,7 +99,7 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterpriseRequest>
      * 批量更新状态
      * @param idList
      */
-    void updateIdList(String[] idList);
+    void updateIdList(List<String>  idList);
 
 
     /**
@@ -107,5 +107,11 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterpriseRequest>
      * @param bPlanEnterprise
      */
     void insert(BPlanEnterpriseRequest bPlanEnterprise);
+
+    /**
+     * 新增
+     * @param bPlanEnterprise
+     */
+    void updatePlan(BPlanEnterpriseRequest bPlanEnterprise);
 }
 

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;
 
@@ -102,7 +102,7 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
     }
 
     @Override
-    public void updateIdList(String[] idList) {
+    public void updateIdList(List<String>  idList) {
         bPlanEnterpriseMapper.updateIdList(idList);
     }
 
@@ -111,6 +111,11 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
         bPlanEnterpriseMapper.insertPlan(bPlanEnterprise);
     }
 
+    @Override
+    public void updatePlan(BPlanEnterpriseRequest bPlanEnterprise) {
+        bPlanEnterpriseMapper.updatePlan(bPlanEnterprise);
+    }
+
 
 }
 

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -317,17 +317,44 @@
     </select>
 
 
-    <update id="updateIdList">
+    <update id="updateIdList" parameterType="java.util.List">
         UPDATE b_plan_enterprise
         SET status = 1
         WHERE id in
-        <foreach item="item" collection="idList" open="(" separator="," close=")">
+        <foreach item="item" collection="list" open="(" separator="," close=")">
             #{item}
         </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">
         insert into b_plan_enterprise
         <trim prefix="(" suffix=")" suffixOverrides=",">