Merge branch '20221025_sun项目申报模块' of sckj/mz-cloud into master

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbXmbdpz.java

@@ -71,11 +71,10 @@ public class ZwywXmsbXmbdpz extends BaseEntity
     @ApiModelProperty(value = "字典类型")
     @Size(max = 12, message = "{字典类型}")
     private String dictType;
+
     /** 数据状态 */
     @Excel(name = "数据状态")
     @ApiModelProperty(value = "数据状态", required = true)
-    @NotBlank(message = "{数据状态}",groups = AddGroup.class)
-    @Size(min = 1, max = 2, message = "{数据状态}")
     private String status;
-
+    
 }

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/IZwywXmsbCommonService.java

@@ -1,7 +1,9 @@
 package com.ruoyi.business.service;
 
-import java.util.List;
 import com.ruoyi.business.domain.ZwywXmsbCommon;
+import com.ruoyi.business.domain.ZwywXmsbXmbdpz;
+
+import java.util.List;
 
 /**
  * 项目申报信息Service接口
@@ -19,6 +21,8 @@ public interface IZwywXmsbCommonService
      */
     public ZwywXmsbCommon selectZwywXmsbCommonById(String id);
 
+    public List<ZwywXmsbXmbdpz> getXmsbAddInfo(String id);
+
     /**
      * 查询项目申报信息列表
      * 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/IZwywXmsbXmlxService.java

@@ -1,8 +1,9 @@
 package com.ruoyi.business.service;
 
-import java.util.List;
 import com.ruoyi.business.domain.ZwywXmsbXmlx;
 
+import java.util.List;
+
 /**
  * 项目申报项目类型信息Service接口
  *
@@ -43,6 +44,8 @@ public interface IZwywXmsbXmlxService
      */
     public int updateZwywXmsbXmlx(ZwywXmsbXmlx zwywXmsbXmlx);
 
+    public int changeStatus(ZwywXmsbXmlx zwywXmsbXmlx);
+
     /**
      * 批量删除项目申报项目类型信息
      *

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbCommonServiceImpl.java

@@ -2,12 +2,15 @@ package com.ruoyi.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.business.domain.ZwywXmsbCommon;
+import com.ruoyi.business.domain.ZwywXmsbXmbdpz;
 import com.ruoyi.business.domain.ZwywXmsbXmlx;
 import com.ruoyi.business.mapper.ZwywXmsbCommonMapper;
+import com.ruoyi.business.mapper.ZwywXmsbXmbdpzMapper;
 import com.ruoyi.business.mapper.ZwywXmsbXmlxMapper;
 import com.ruoyi.business.service.IZwywXmsbCommonService;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.enums.DataStatus;
 import com.ruoyi.system.api.enums.XmsbStatus;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
 import org.apache.commons.lang3.ObjectUtils;
@@ -35,6 +38,9 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
     @Autowired
     private ZwywXmsbXmlxMapper xwywXmsbXmlxMapper;
 
+    @Autowired
+    private ZwywXmsbXmbdpzMapper zwywXmsbXmbdpzMapper;
+
     /**
      * 查询项目申报信息
      * 
@@ -45,15 +51,23 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
     public ZwywXmsbCommon selectZwywXmsbCommonById(String id)
     {
         ZwywXmsbCommon res = zwywXmsbCommonMapper.selectById(id);
-        ZwywXmsbXmlx xmlx = xwywXmsbXmlxMapper.selectById(res.getXmlx());
-        if (ObjectUtils.isNotEmpty(xmlx)) {
-            res.setXmlxName(xmlx.getLxmc());
+        if (ObjectUtils.isNotEmpty(res)) {
+            ZwywXmsbXmlx xmlx = xwywXmsbXmlxMapper.selectById(res.getXmlx());
+            if (ObjectUtils.isNotEmpty(xmlx)) {
+                res.setXmlxName(xmlx.getLxmc());
+            }
+            res.setSzdqName(sysDeptJlMapper.getXzqhNames(res.getSzdq()));
+            res.setSzdq(sysDeptJlMapper.getXzqhCodes(res.getSzdq()));
         }
-        res.setSzdqName(sysDeptJlMapper.getXzqhNames(res.getSzdq()));
-        res.setSzdq(sysDeptJlMapper.getXzqhCodes(res.getSzdq()));
         return res;
     }
 
+    @Override
+    public List<ZwywXmsbXmbdpz> getXmsbAddInfo(String id) {
+        return zwywXmsbXmbdpzMapper.selectList(new LambdaQueryWrapper<ZwywXmsbXmbdpz>()
+                .eq(ZwywXmsbXmbdpz::getXmlxId, id).eq(ZwywXmsbXmbdpz::getStatus, DataStatus.NORMAL.getCode()));
+    }
+
     /**
      * 查询项目申报信息列表
      * 

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/service/impl/ZwywXmsbXmlxServiceImpl.java

@@ -1,21 +1,21 @@
 package com.ruoyi.business.service.impl;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.business.domain.ZwywXmsbFjlx;
 import com.ruoyi.business.domain.ZwywXmsbXmbdpz;
+import com.ruoyi.business.domain.ZwywXmsbXmlx;
 import com.ruoyi.business.mapper.ZwywXmsbFjlxMapper;
 import com.ruoyi.business.mapper.ZwywXmsbXmbdpzMapper;
-import com.ruoyi.system.api.enums.StateStatus;
+import com.ruoyi.business.mapper.ZwywXmsbXmlxMapper;
+import com.ruoyi.business.service.IZwywXmsbXmlxService;
+import com.ruoyi.system.api.enums.DataStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.util.Arrays;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.business.mapper.ZwywXmsbXmlxMapper;
-import com.ruoyi.business.domain.ZwywXmsbXmlx;
-import com.ruoyi.business.service.IZwywXmsbXmlxService;
+import java.util.List;
 
 /**
  * 项目申报项目类型信息Service业务层处理
@@ -78,21 +78,27 @@ public class ZwywXmsbXmlxServiceImpl implements IZwywXmsbXmlxService
      * @return 结果
      */
     @Override
-    public int updateZwywXmsbXmlx(ZwywXmsbXmlx zwywXmsbXmlx)
+    public int changeStatus(ZwywXmsbXmlx zwywXmsbXmlx)
     {
         //0 开启
-        if (StateStatus.NORMAL.getCode().equals(zwywXmsbXmlx.getStatus())){
+        if (DataStatus.DELETE.getCode().equals(zwywXmsbXmlx.getStatus())){
             LambdaUpdateWrapper<ZwywXmsbFjlx> zwywXmsbFjlx = Wrappers.lambdaUpdate();
-            zwywXmsbFjlx.eq(ZwywXmsbFjlx::getXmlxId,zwywXmsbXmlx.getId()).set(ZwywXmsbFjlx::getStatus,StateStatus.NORMAL.getCode());
+            zwywXmsbFjlx.eq(ZwywXmsbFjlx::getXmlxId,zwywXmsbXmlx.getId()).set(ZwywXmsbFjlx::getStatus,DataStatus.DELETE.getCode());
             zwywXmsbFjlxMapper.update(null,zwywXmsbFjlx);
 
             LambdaUpdateWrapper<ZwywXmsbXmbdpz> zwywXmsbXmbdpz = Wrappers.lambdaUpdate();
-            zwywXmsbXmbdpz.eq(ZwywXmsbXmbdpz::getXmlxId,zwywXmsbXmlx.getId()).set(ZwywXmsbXmbdpz::getStatus,StateStatus.NORMAL.getCode());
+            zwywXmsbXmbdpz.eq(ZwywXmsbXmbdpz::getXmlxId,zwywXmsbXmlx.getId()).set(ZwywXmsbXmbdpz::getStatus,DataStatus.DELETE.getCode());
             zwywXmsbXmbdpzMapper.update(null,zwywXmsbXmbdpz);
         }
         return zwywXmsbXmlxMapper.updateById(zwywXmsbXmlx);
     }
 
+    @Override
+    public int updateZwywXmsbXmlx(ZwywXmsbXmlx zwywXmsbXmlx)
+    {
+        return zwywXmsbXmlxMapper.updateById(zwywXmsbXmlx);
+    }
+
     /**
      * 批量删除项目申报项目类型信息
      *

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywXmsbCommonController.java

@@ -1,7 +1,9 @@
 package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.ZwywXmsbCommon;
+import com.ruoyi.business.domain.ZwywXmsbXmbdpz;
 import com.ruoyi.business.service.IZwywXmsbCommonService;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -16,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -66,6 +69,16 @@ public class ZwywXmsbCommonController extends BaseController
         return AjaxResult.success(zwywXmsbCommonService.selectZwywXmsbCommonById(id));
     }
 
+    @RequiresPermissions("business:xmsbCommon:edit")
+    @GetMapping("/info")
+    public List<ZwywXmsbXmbdpz> getXmsbAddInfo(ZwywXmsbCommon zwywXmsbCommon)
+    {
+        if (StringUtils.isEmpty(zwywXmsbCommon.getXmlx())) {
+            return new ArrayList<>();
+        }
+        return zwywXmsbCommonService.getXmsbAddInfo(zwywXmsbCommon.getXmlx());
+    }
+
     /**
      * 新增项目申报信息
      */

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywXmsbXmlxController.java

@@ -93,7 +93,7 @@ public class ZwywXmsbXmlxController extends BaseController
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@Validated @RequestBody ZwywXmsbXmlx zwywXmsbXmlx)
     {
-        return toAjax(zwywXmsbXmlxService.updateZwywXmsbXmlx(zwywXmsbXmlx));
+        return toAjax(zwywXmsbXmlxService.changeStatus(zwywXmsbXmlx));
     }
 
     /**

ruoyi-ui/src/api/business/xmsb/xmsbCommon.js

@@ -42,3 +42,12 @@ export function delXmsbCommon(id) {
     method: 'delete'
   })
 }
+
+// 查询项目申报新增信息详细
+export function getXmsbAddInfo(query) {
+  return request({
+    url: '/business/xmsbCommon/info',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/views/business/xmsb/xmbdpz/index.vue

@@ -112,6 +112,10 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item v-if="form.type == 'select'" label="表单项字典类型" prop="dictType">
+          <el-input v-model="form.dictType" placeholder="请输入表单项字典类型" />
+        </el-form-item>
+
         <el-form-item label="是否必填" prop="required">
           <el-radio-group v-model="form.required">
             <el-radio
@@ -122,6 +126,8 @@
           </el-radio-group>
         </el-form-item>
 
+        
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
@@ -187,6 +193,9 @@
         type: [
           { required: true, message: "表单项类型不能为空", trigger: "change" },
         ],
+        dictType: [
+          { required: true, message: "表单项字典类型不能为空", trigger: "change" },
+        ],
         required: [
           { required: true, message: "是否必填不能为空", trigger: "blur" },
         ],

ruoyi-ui/src/views/business/xmsb/xmsbCommon/index.vue

@@ -107,6 +107,15 @@
             v-hasPermi="['business:xmsbCommon:sh']"
             >审核</el-button
           >
+          <el-button
+            v-if="scope.row.sbzt=='0'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleSub(scope.row)"
+            v-hasPermi="['business:xmsbCommon:edit']"
+            >提交</el-button
+          >
           <el-button
             v-if="scope.row.sbzt=='0'"
             size="mini"
@@ -269,6 +278,18 @@
           <el-input v-model="form.xmssdw" placeholder="请输入项目实施单位" />
         </el-form-item>
 
+        <el-form-item v-for="kz in kzList" :key="kz.id" :label="kz.label" :prop="kz.id">
+          <el-input v-if="kz.type == 'input'" v-model="kz.value" placeholder="请输入" />
+          <el-select v-if="kz.type == 'select'" v-model="kz.value" placeholder="请选择">
+            <el-option
+              v-for="dict in kz.dictData"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="备注" prop="bz">
           <el-input
             v-model="form.bz"
@@ -299,6 +320,7 @@ import {
   getXmsbCommon,
   listXmsbCommon,
   updateXmsbCommon,
+  getXmsbAddInfo,
 } from "@/api/business/xmsb/xmsbCommon";
 import xmsbFj from "../xmsbFj/index";
 import { chineseOne, idCard, Regular } from "@/utils/regular";
@@ -336,6 +358,7 @@ export default {
       openView: false,
       // 备注时间范围
       daterangeSbrq: [],
+      kzList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -530,6 +553,22 @@ export default {
       this.openView = true;
       this.viewTitle = "附件列表";
     },
+    /** 提交按钮操作 */
+    handleSub(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      const param = {
+        id: id,
+        status: '1',
+      }
+      this.submitFormLoading = true;
+      updateXmsbCommon(param)
+        .then((response) => {
+          this.$modal.msgSuccess("提交成功");
+          this.getList();
+        })
+        .finally(() => (this.submitFormLoading = false));
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -541,9 +580,6 @@ export default {
         } else {
           this.form.szdq = "";
         }
-        /****** sks 需要改动的地方 start ******/
-        this.copyForm = this.deepCopy(response.data);
-        /****** sks 需要改动的地方 end ******/
         this.open = true;
         this.title = "修改项目申报信息";
       });
@@ -568,8 +604,6 @@ export default {
                   this.getList();
                 })
                 .finally(() => (this.submitFormLoading = false));
-            } 
-            /****** sks 需要改动的地方 end ******/
           } else {
             addXmsbCommon({...this.form, szdq: szxzqh})
               .then((response) => {
@@ -579,6 +613,7 @@ export default {
               })
               .finally(() => (this.submitFormLoading = false));
           }
+        }
       });
     },
     /** 删除按钮操作 */
@@ -625,6 +660,13 @@ export default {
     },
     changFormXmlx(xmIdData, data){
       this.form.xmlx = xmIdData;
+      const param = {
+        xmlx: this.form.xmlx,
+      }
+      getXmsbAddInfo(param).then((res) => {
+        this.kzList = res;
+        console.log(this.kzList)
+      });
     },
   },
 };