行政区划修改

jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue

@@ -68,20 +68,19 @@
     </el-row>
 
     <el-table
+      ref="refTable"
       v-loading="loading"
       :data="contractsList"
       @selection-change="handleSelectionChange"
       :row-key="getRowKeys"
       :expand-row-keys="expands"
-      @expand-change="expandChange"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 
-      <el-table-column type="expand">
+      <el-table-column type="expand" prop="children">
         <template slot-scope="props">
           <el-table
             @selection-change="handleSelectionChange"
-            :data="props.row.details"
+            :data="props.row.children"
             stripe border
           >
             <el-table-column type="selection" width="55" align="center" fixed/>
@@ -521,6 +520,7 @@ export default {
     // 关闭弹窗
     close() {
       this.reset();
+      this.getList();
 
     },
     /** 重置按钮操作 */
@@ -606,8 +606,21 @@ export default {
         this.$message.warning("请选择要删除的数据！！");
       }
     },
+    expandChange (row, expandedRows) {
+      let that = this
+      if (expandedRows.length > 1) {
+        that.expands = []
+        if (row) {
+          that.expands.push(row)
+        }
+        this.$refs.refTable.toggleRowExpansion(expandedRows[0])
+      } else {
+        that.expands = []
+      }
+    },
+
 
-    expandChange(row) {
+    /*expandChange(row) {
       if(!row.loadDetails){
 
         //根据loadDetails判定是否已经加载了数据
@@ -623,7 +636,7 @@ export default {
           })
         },1000)
       }
-    },
+    },*/
     // 表格中下载
     downloadProjectFile(scope, index) {
       // console.log(scope);

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiContInfoController.java

@@ -61,6 +61,7 @@ public class BsSgcJsjdBuiContInfoController extends BaseController
     @ApiOperation("合同基本信息列表")
     public IPage listByNo(@RequestBody SearchParam<BsSgcJsjdBuiContInfo> sp)
     {
+
         return bsSgcJsjdBuiContInfoService.selectPageByCode(sp);
     }
 

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java

@@ -115,6 +115,8 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController {
     @ApiOperation("资金用途新增")
     public AjaxResult add(@RequestBody BsSgcJsjdBuiPurposeFunds bsSgcJsjdBuiPurposeFunds) {
         BaseEntityUtils.preInsert(bsSgcJsjdBuiPurposeFunds);
+        String contractNumber = bsSgcJsjdBuiPurposeFunds.getContractNumber();
+
         return toAjax(bsSgcJsjdBuiPurposeFundsService.save(bsSgcJsjdBuiPurposeFunds));
     }
 

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java

@@ -2,6 +2,9 @@ package com.kms.build.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +61,9 @@ public class BsSgcJsjdBuiContInfo extends BaseEntity
     @ApiModelProperty("合同状态")
     private String contractStatus;
 
+    @TableField(exist = false)
+    private List<BsSgcJsjdBuiPurposeFunds> children;
+
     /** 标段名称 */
     @Excel(name = "标段名称")
     @ApiModelProperty("标段名称")

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiContInfoService.java

@@ -7,10 +7,13 @@ import com.jianwei.common.core.domain.SearchParam;
 import com.kms.build.domain.BsSgcJsjdBuiContInfo;
 import com.kms.build.domain.BsSgcJsjdBuiPurposeFunds;
 import com.kms.build.mapper.BsSgcJsjdBuiContInfoMapper;
+import com.kms.build.mapper.BsSgcJsjdBuiPurposeFundsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 
+import java.util.List;
+
 
 /**
  * 合同基本信息Service接口
@@ -24,6 +27,9 @@ public class BsSgcJsjdBuiContInfoService extends BaseService<BsSgcJsjdBuiContInf
     @Autowired
     private BsSgcJsjdBuiContInfoMapper mapper;
 
+    @Autowired
+    private BsSgcJsjdBuiPurposeFundsMapper purposeFundsMapper;
+
     public IPage selectPageByCode(SearchParam<BsSgcJsjdBuiContInfo> sp) {
         BsSgcJsjdBuiContInfo data = sp.getData();
         Page<BsSgcJsjdBuiContInfo> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -35,6 +41,17 @@ public class BsSgcJsjdBuiContInfoService extends BaseService<BsSgcJsjdBuiContInf
         queryWrapper.orderBy(true, sp.getParams().get("sort").equals("asc"), "create_time");
 
         Page<BsSgcJsjdBuiContInfo> fundsPage = mapper.selectPage(page, queryWrapper);
+        List<BsSgcJsjdBuiContInfo> records = fundsPage.getRecords();
+
+        for (BsSgcJsjdBuiContInfo record : records) {
+            String contractNumber = record.getContractNumber();
+            QueryWrapper<BsSgcJsjdBuiPurposeFunds> wrapper = new QueryWrapper<>();
+            wrapper.eq("CONTRACT_NUMBER", contractNumber);
+            List<BsSgcJsjdBuiPurposeFunds> bsSgcJsjdBuiPurposeFunds = purposeFundsMapper.selectList(wrapper);
+            if (!bsSgcJsjdBuiPurposeFunds.isEmpty()) {
+                record.setChildren(bsSgcJsjdBuiPurposeFunds);
+            }
+        }
         return fundsPage;
 
 

jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java

@@ -74,10 +74,25 @@ public class SpecialProjectInfoController extends BaseController
 
         SysUser sysUser = UserUtils.getUser();
         if (sysUser.getUserName().equals("admin")) {
-            if (projectInfo != null) {
-                projectInfo.setAdcd(null);
+            if (projectInfo != null && projectInfo.getAdcd() != null) {
+                String infoAdcd = projectInfo.getAdcd();
+                QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+                sysXzqhQueryWrapper.eq("XZQHDM", infoAdcd);
+                SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+                if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 2);
+
+                } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                    infoAdcd = xzqh.getXzqhdm().substring(0, 4);
+
+                }else {
+                    infoAdcd = xzqh.getXzqhdm();
+                }
+                return specialProjectInfoService.selectPage(sp,infoAdcd);
+            }else {
+                return specialProjectInfoService.selectPage(sp);
             }
-            return specialProjectInfoService.selectPage(sp);
+
         }else if (adcd == null) {
             SysUser user = UserUtils.getUser();
             String deptId = user.getDeptId();
@@ -97,6 +112,20 @@ public class SpecialProjectInfoController extends BaseController
 
             return specialProjectInfoService.selectPage(sp,substring);
         }else {
+
+            QueryWrapper<SysXzqh> sysXzqhQueryWrapper = new QueryWrapper<>();
+            sysXzqhQueryWrapper.eq("XZQHDM", adcd);
+
+            SysXzqh xzqh = sysXzqhService.getOne(sysXzqhQueryWrapper);
+            if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 2);
+
+            } else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
+                adcd = xzqh.getXzqhdm().substring(0, 4);
+
+            }else {
+                adcd = xzqh.getXzqhdm();
+            }
             return specialProjectInfoService.selectPage(sp, adcd);
         }