Browse Source

行政区划修改

dev_kxc
zhuyulei 1 year ago
parent
commit
be9e9793ce
  1. 8
      jwtech-admin-page/src/api/build/funds.js
  2. 1103
      jwtech-admin-page/src/views/building/contract/options/evaluatePage.vue
  3. 1166
      jwtech-admin-page/src/views/building/contract/options/honourAnAgreementPage.vue
  4. 4
      jwtech-admin-page/src/views/building/contract/options/index.vue
  5. 10
      jwtech-admin-page/src/views/building/firmInfo/index.vue
  6. 299
      jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue
  7. 12
      jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java
  8. 12
      jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java
  9. 40
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java
  10. 40
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java
  11. 46
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java
  12. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java
  13. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java
  14. 2
      jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java
  15. 24
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
  16. 24
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java
  17. 20
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

8
jwtech-admin-page/src/api/build/funds.js

@ -25,6 +25,14 @@ export function getRecord(id) {
})
}
export function getContractId(id) {
return request({
url: '/build/purFunds/getContractId/' + id,
method: 'get'
})
}
// 新增资金用途
export function addFunds(data) {
return request({

1103
jwtech-admin-page/src/views/building/contract/options/evaluatePage.vue

File diff suppressed because it is too large

1166
jwtech-admin-page/src/views/building/contract/options/honourAnAgreementPage.vue

File diff suppressed because it is too large

4
jwtech-admin-page/src/views/building/contract/options/index.vue

@ -59,7 +59,7 @@
:contractNumber="formData ? formData.contractNumber : ''"
/>
</el-tab-pane>
<el-tab-pane
<!-- <el-tab-pane
label="合同履约评价表"
name="honourAnAgreementPage"
:disabled="!routeList[1].isEdit"
@ -76,7 +76,7 @@
<evaluatePage
:contractNumber="formData ? formData.contractNumber : ''"
/>
</el-tab-pane>
</el-tab-pane>-->
</el-tabs>
</div>
</template>

10
jwtech-admin-page/src/views/building/firmInfo/index.vue

@ -492,7 +492,7 @@
@close="closeView"
>
<!-- 查看企业信息 -->
<div class="infoTitle">企业信息</div>
<div class="infoTitle">参建企业信息</div>
<div class="draLine"></div>
<div class="content">
<el-descriptions
@ -683,7 +683,7 @@ export default {
routeList: [
{
path: "/building/firmInfo",
routeName: "企业信息管理",
routeName: "参建企业信息管理",
},
],
};
@ -800,7 +800,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加企业信息管理";
this.title = "添加参建企业信息管理";
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -809,13 +809,13 @@ export default {
getInfo(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改企业信息管理";
this.title = "修改参建企业信息管理";
});
},
//
viewInfo(row) {
this.viewTitle = "查看企业信息";
this.viewTitle = "查看参建企业信息";
this.firmMsg = row;
console.log("firmMsg", row);
this.viewOpen = true;

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

@ -36,16 +36,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['build:sourceFunds:add']"
>新增</el-button
>
</el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@ -90,7 +81,7 @@
<template slot-scope="props">
<el-table
@selection-change="handleSelectionChange"
:data="props.row.details" v-loading="!props.row.loadDetails"
:data="props.row.details"
stripe border
>
<el-table-column type="selection" width="55" align="center" fixed/>
@ -108,7 +99,27 @@
<el-table-column label="本期实付金额" min-width="120" align="center" prop="paidinAmount"/>
<el-table-column label="本期暂扣款" min-width="120" align="center" prop="temporaryWithholding"/>
<el-table-column label="合同支付票据" min-width="120" align="center" prop="paymentBill"/>
<el-table-column label="操作" min-width="120" align="center"/>
<el-table-column label="操作" min-width="120" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['build:sourceFunds:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['build:sourceFunds:remove']"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
@ -182,12 +193,12 @@
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['build:sourceFunds:edit']"
>修改
>资金支付
</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@ -195,7 +206,7 @@
v-hasPermi="['build:sourceFunds:remove']"
>删除
</el-button
>
>-->
</template>
</el-table-column>
</el-table>
@ -220,51 +231,109 @@
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-col :span="12">
<el-form-item label="下达日期" prop="releaseTime">
<el-form-item label="支付条款" prop="paymentTerms">
<el-input v-model="form.paymentTerms" placeholder="支付条款"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支付期数" prop="paymentPeriods">
<el-input v-model="form.paymentPeriods" placeholder="支付期数"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起始年月" prop="startingYear">
<el-date-picker
v-model="timeScope"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支付日期" prop="paymentTime">
<el-date-picker
clearable
size="small"
style="width: 100%"
v-model="form.releaseTime"
v-model="form.paymentTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请输入下达日期"
placeholder="请输入支付日期"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="中央资金(万元)" prop="centralArrangedFunds">
<el-input v-model="form.centralArrangedFunds" placeholder="请输入中央资金(万元)"/>
<el-form-item label="本期应付金额" prop="payableAmount">
<el-input v-model="form.payableAmount" placeholder="请输入本期应付金额"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="省级资金(万元)" prop="provincialFunding">
<el-form-item label="本期实付金额" prop="paidinAmount">
<el-input
v-model="form.provincialFunding"
placeholder="请输入省级资金(万元)"
v-model="form.paidinAmount"
placeholder="请输入本期实付金额"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="地市级资金(万元)" prop="cityLevelFunds">
<el-form-item label="本期暂扣款" prop="temporaryWithholding">
<el-input
v-model="form.cityLevelFunds"
v-model="form.temporaryWithholding"
placeholder="请输入地市级资金(万元)"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="县级资金(万元)" prop="countyLevelFunds">
<el-input v-model="form.countyLevelFunds" placeholder="请输入县级资金(万元)"/>
<el-form-item label="项目法人审核人" prop="auditor">
<el-input v-model="form.auditor" placeholder="请输入县级资金(万元)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="乡镇及群众自筹和其他投资(万元)" prop="townshipInvestments">
<el-input v-model="form.townshipInvestments" placeholder="请输入乡镇及群众自筹和其他投资(万元)"/>
<el-form-item label="项目法人经办人" prop="agent">
<el-input v-model="form.agent" placeholder="请输入乡镇及群众自筹和其他投资(万元)"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="合同支付票据"
prop="paymentBill"
>
<!-- <el-input
v-model="form.projectAttachment"
placeholder="请输入规划附件"
/> -->
<el-upload
class="upload-demo"
action="thinking/common/upload"
:headers="headers"
:on-preview="handleProjectPreview"
:on-remove="handleProjectRemove"
:before-remove="beforeProjectRemove"
multiple
:on-exceed="handleProjectExceed"
:on-success="submitProjectUpload"
:file-list="projectFileList"
>
<el-button size="small" type="primary" plain>
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div slot="tip" class="el-upload__tip">
支持jpg/png/pdf/word/excel文件等不超过100M
</div>
</el-upload>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div slot="footer" class="dialog-footer">
@ -284,6 +353,7 @@ import {
updateFunds,
exportFunds,
getRecord,
getContractId,
} from "@/api/build/funds";
import {
@ -296,11 +366,23 @@ import {
listInfoByCode,
} from "@/api/build/contractInfo";
import { getFileStream } from "@/api/system/upload";
import { getToken } from "@/utils/auth";
export default {
name: "sourceFunds",
props: ["formData"],
data() {
return {
timeScope:[],
contractNumber:"",
//
projectFileList: [],
//
headers: {
jianwei: "jwtech " + getToken(),
},
expands: [],
getRowKeys(row) {
return row.id;
@ -386,28 +468,40 @@ export default {
},
//
reset() {
this.timeScope=[]
this.form = {
releaseTime: null,
centralArrangedFunds: null,
provincialFunding: null,
cityLevelFunds: null,
countyLevelFunds: null,
townshipInvestments: null,
paymentTerms: null,
paymentPeriods: null,
startingYear: null,
paymentTime: null,
payableAmount: null,
paidinAmount: null,
temporaryWithholding:null,
auditor:null,
agent:null,
paymentBill:null,
};
this.resetForm("form");
},
//
resetQueryForm() {
this.timeScope=[]
this.queryParams = {
pageNum: 1,
pageSize: 10,
data: {
releaseTime: null,
centralArrangedFunds: null,
provincialFunding: null,
cityLevelFunds: null,
countyLevelFunds: null,
townshipInvestments: null,
paymentTerms: null,
paymentPeriods: null,
startingYear: null,
paymentTime: null,
payableAmount: null,
paidinAmount: null,
temporaryWithholding:null,
auditor:null,
agent:null,
paymentBill:null,
},
//
params: {
@ -427,6 +521,7 @@ export default {
//
close() {
this.reset();
},
/** 重置按钮操作 */
resetQuery() {
@ -440,19 +535,24 @@ export default {
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
handleAdd(row) {
this.reset();
this.open = true;
this.title = "添加下达资金";
this.title = "资金支付";
this.contractNumber = row.contractNumber;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getFunds(id).then((response) => {
this.timeScope.push(response.data.startYear)
this.timeScope.push(response.data.endYear)
this.form = response.data;
this.open = true;
this.title = "修改下达资金";
this.title = "修改资金支付";
});
},
/** 提交按钮 */
@ -464,12 +564,15 @@ export default {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
this.form.startYear = this.timeScope[0];
this.form.endYear = this.timeScope[1];
this.form.proNo = this.$route.query.proNo;
this.form.proCode = this.$route.query.proCode;
this.form.contractNumber = this.contractNumber;
addFunds(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
@ -503,53 +606,16 @@ export default {
this.$message.warning("请选择要删除的数据!!");
}
},
/*expandChange(row,expandedRows){
this.childListLoading = true;
let query = {parkOrderId: row.parkOrderId}
getRecord(row.id).then((response) => {
this.infoList=response.data
this.infoList.push({}); //vue
this.infoList.pop(); //
this.childListLoading = false;
})
},*/
/*expandChange(row, expandedRows) {
if (expandedRows.length) {
this.expands = []
if (row) {
this.expands.push(row.id)
}
} else {
this.expands = []
}
getRecord(row.id).then((response) => {
if (response.data.size === 0) {
this.contractsList.forEach((item, index) => {
this.contractsList[index].children = {};
})
}else {
this.contractsList.forEach((item, index) => {
if (row.contractNumber === response.data[0].contractNumber) {
this.contractsList[index].children = response.data;
}
});
}
})
}*/
expandChange(row) {
if(!row.loadDetails){
let temp = [];
//loadDetails
setTimeout(() =>{
getRecord(row.id).then((res)=>{
row.details = res.data;
})
});
setTimeout(() =>{
row.loadDetails= true //
this.$message({
showClose: true,
@ -557,7 +623,64 @@ export default {
})
},1000)
}
}
},
//
downloadProjectFile(scope, index) {
// console.log(scope);
let file = JSON.parse(scope.row.projectProposalAttachment)[index];
this.handleProjectPreview(file);
},
// ,
downloadProjectFile2(info, index) {
console.log(info);
this.handleProjectPreview(info);
},
//
handleProjectPreview(file) {
// console.log(file);
getFileStream({ fileName: file.fileName }).then((res) => {
const blob = new Blob([res], {
// type
// application/xlsx application/zip
type: "application/xlsx",
}); //excel,pdf
const href = URL.createObjectURL(blob); //URLblob
const a = document.createElement("a"); //a
a.style.display = "none";
a.href = href; //
a.download = file.name; //
a.click(); //
URL.revokeObjectURL(a.href); //URL
});
},
handleProjectRemove(file, fileList) {
// console.log(file, fileList);
let index = this.projectFileList.findIndex(
(item) => item.uid === file.uid
);
//
this.projectFileList.splice(index, 1);
},
beforeProjectRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}`);
},
handleProjectExceed(files, fileList) {
this.$message.warning(
`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${
files.length + fileList.length
} 个文件`
);
},
submitProjectUpload(_, fileList) {
console.log("fileList", fileList);
this.projectFileList.push({
name: fileList.name,
fileName: fileList.response.fileName,
url: fileList.response.url,
uid: fileList.uid,
});
},
},
};
</script>

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

@ -73,6 +73,18 @@ public class BsSgcJsjdBuiPurposeFundsController extends BaseController {
}
@GetMapping("/getContractId/{id}")
public AjaxResult getContractId(@PathVariable("id") String id) {
BsSgcJsjdBuiPurposeFunds purposeFunds = bsSgcJsjdBuiPurposeFundsService.getById(id);
String contractNumber = purposeFunds.getContractNumber();
QueryWrapper<BsSgcJsjdBuiContInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("CONTRACT_NUMBER", contractNumber);
BsSgcJsjdBuiContInfo contInfo = bsSgcJsjdBuiContInfoService.getOne(queryWrapper);
return AjaxResult.success(contInfo.getId());
}
/**
* 导出资金用途列表

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

@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.jianwei.common.core.domain.BaseEntity;
import java.util.Date;
import java.util.List;
/**
* 资金用途对象 bs_sgc_jsjd_bui_purpose_funds
@ -37,9 +38,14 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity
@ApiModelProperty("支付期数")
private String paymentPeriods;
@Excel(name = "起始年月")
/*@Excel(name = "起始年月")
@ApiModelProperty("起始年月")
private String startingYear;
private String startingYear;*/
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date startYear;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endYear;
@Excel(name = "支付条款")
@ApiModelProperty("支付条款")
@ -63,7 +69,7 @@ public class BsSgcJsjdBuiPurposeFunds extends BaseEntity
@Excel(name = "支付时间")
@ApiModelProperty("支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date paymentTime;
/** 审核人 */

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

@ -1,14 +1,22 @@
package com.kms.earlyStage.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectProposal;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -45,6 +53,12 @@ public class SpecialProjectFeasibilityController extends BaseController
@Autowired
private SpecialProjectFeasibilityService specialProjectFeasibilityService;
@Autowired
private SysXzqhService sysXzqhService;
@Autowired
private SysDeptService sysDeptService;
/**
* 查询可行性研究报告列表
*/
@ -52,7 +66,33 @@ public class SpecialProjectFeasibilityController extends BaseController
@ApiOperation("可行性研究报告列表")
public IPage list(@RequestBody SearchParam<SpecialProjectFeasibility> sp)
{
SpecialProjectFeasibility planInfo = sp.getData();
String adcd = planInfo.getAdcd();
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
planInfo.setAdcd(null);
return specialProjectFeasibilityService.selectPage(sp);
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return specialProjectFeasibilityService.selectPage(sp,substring);
}else {
return specialProjectFeasibilityService.selectPage(sp, adcd);
}
}
/**

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

@ -1,14 +1,22 @@
package com.kms.earlyStage.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectFeasibility;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -45,6 +53,12 @@ public class SpecialProjectPreDesignController extends BaseController
@Autowired
private SpecialProjectPreDesignService specialProjectPreDesignService;
@Autowired
private SysDeptService sysDeptService;
@Autowired
private SysXzqhService sysXzqhService;
/**
* 查询初步设计管理列表
*/
@ -52,7 +66,33 @@ public class SpecialProjectPreDesignController extends BaseController
@ApiOperation("初步设计管理列表")
public IPage list(@RequestBody SearchParam<SpecialProjectPreDesign> sp)
{
SpecialProjectPreDesign planInfo = sp.getData();
String adcd = planInfo.getAdcd();
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
planInfo.setAdcd(null);
return specialProjectPreDesignService.selectPage(sp);
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return specialProjectPreDesignService.selectPage(sp,substring);
}else {
return specialProjectPreDesignService.selectPage(sp, adcd);
}
}
/**

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

@ -1,15 +1,23 @@
package com.kms.earlyStage.controller;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysDept;
import com.jianwei.common.core.domain.entity.SysUser;
import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.common.utils.UserUtils;
import com.kms.earlyStage.domain.SpecialProjectPlanInfo;
import com.kms.system.domain.SysXzqh;
import com.kms.system.service.SysDeptService;
import com.kms.system.service.SysXzqhService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
@ -47,6 +55,12 @@ public class SpecialProjectProposalController extends BaseController
@Autowired
private SpecialProjectProposalService specialProjectProposalService;
@Autowired
private SysDeptService sysDeptService;
@Autowired
private SysXzqhService sysXzqhService;
/*@ApiOperation("项目建议书获取全部项目编码")
@ -74,7 +88,39 @@ public class SpecialProjectProposalController extends BaseController
@ApiOperation("项目建议书列表")
public IPage list(@RequestBody SearchParam<SpecialProjectProposal> sp)
{
SpecialProjectProposal planInfo = sp.getData();
String adcd = null;
if (planInfo != null) {
adcd = planInfo.getAdcd();
}
SysUser sysUser = UserUtils.getUser();
if (sysUser.getUserName().equals("admin")) {
if (planInfo != null) {
planInfo.setAdcd(null);
}
return specialProjectProposalService.selectPage(sp);
}else if (adcd == null) {
SysUser user = UserUtils.getUser();
String deptId = user.getDeptId();
SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId();
SysXzqh xzqh = sysXzqhService.getById(xzqhId);
String substring = "";
if (xzqh.getLayer().compareTo(BigDecimal.valueOf(1.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 2);
} else if (xzqh.getLayer().compareTo(BigDecimal.valueOf(2.000000000000000000000000000000)) == 0) {
substring = xzqh.getXzqhdm().substring(0, 4);
}else {
substring = xzqh.getXzqhdm();
}
return specialProjectProposalService.selectPage(sp,substring);
}else {
return specialProjectProposalService.selectPage(sp, adcd);
}
}
/**

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java

@ -114,4 +114,6 @@ public class SpecialProjectFeasibility extends BaseEntity
@ApiModelProperty("数源部门")
private String owerDept;
private String adcd;
}

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java

@ -93,4 +93,6 @@ public class SpecialProjectPreDesign extends BaseEntity
@ApiModelProperty("项目类型")
private String projectType;
private String adcd;
}

2
jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java

@ -112,4 +112,6 @@ public class SpecialProjectProposal extends BaseEntity
private String isConstruction;
private String adcd;
}

24
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java

@ -1,5 +1,11 @@
package com.kms.earlyStage.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.SearchParam;
import com.kms.earlyStage.domain.SpecialProjectProposal;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jianwei.common.core.service.BaseService;
import com.kms.earlyStage.mapper.SpecialProjectFeasibilityMapper;
@ -14,4 +20,22 @@ import com.kms.earlyStage.domain.SpecialProjectFeasibility;
@Service
public class SpecialProjectFeasibilityService extends BaseService<SpecialProjectFeasibilityMapper, SpecialProjectFeasibility>{
@Autowired
private SpecialProjectFeasibilityMapper specialProjectFeasibilityMapper;
public IPage selectPage(SearchParam<SpecialProjectFeasibility> sp, String adcd) {
QueryWrapper<SpecialProjectFeasibility> queryWrapper = new QueryWrapper<>();
SpecialProjectFeasibility projectInfo = sp.getData();
String projectName = projectInfo.getProjectName();
String projectType = projectInfo.getProjectType();
queryWrapper.like(projectName != null, "project_name", projectName);
queryWrapper.like(projectType != null, "project_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
Page<SpecialProjectFeasibility> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<SpecialProjectFeasibility> infoPage = specialProjectFeasibilityMapper.selectPage(page, queryWrapper);
return infoPage;
}
}

24
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java

@ -1,5 +1,11 @@
package com.kms.earlyStage.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.SearchParam;
import com.kms.earlyStage.domain.SpecialProjectFeasibility;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jianwei.common.core.service.BaseService;
import com.kms.earlyStage.mapper.SpecialProjectPreDesignMapper;
@ -14,4 +20,22 @@ import com.kms.earlyStage.domain.SpecialProjectPreDesign;
@Service
public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPreDesignMapper, SpecialProjectPreDesign>{
@Autowired
private SpecialProjectPreDesignMapper specialProjectPreDesignMapper;
public IPage selectPage(SearchParam<SpecialProjectPreDesign> sp, String adcd) {
QueryWrapper<SpecialProjectPreDesign> queryWrapper = new QueryWrapper<>();
SpecialProjectPreDesign projectInfo = sp.getData();
String projectName = projectInfo.getProjectName();
queryWrapper.like(projectName != null, "project_name", projectName);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
Page<SpecialProjectPreDesign> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<SpecialProjectPreDesign> infoPage = specialProjectPreDesignMapper.selectPage(page, queryWrapper);
return infoPage;
}
}

20
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

@ -1,5 +1,10 @@
package com.kms.earlyStage.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jianwei.common.core.domain.SearchParam;
import com.kms.earlyStage.domain.SpecialProjectPlanInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jianwei.common.core.service.BaseService;
@ -26,4 +31,19 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
return list;
}
public IPage selectPage(SearchParam<SpecialProjectProposal> sp, String adcd) {
QueryWrapper<SpecialProjectProposal> queryWrapper = new QueryWrapper<>();
SpecialProjectProposal projectInfo = sp.getData();
String projectName = projectInfo.getProjectName();
String projectType = projectInfo.getProjectType();
queryWrapper.like(projectName != null, "project_name", projectName);
queryWrapper.like(projectType != null, "project_type", projectType);
queryWrapper.likeRight(adcd != null, "ADCD", adcd);
Page<SpecialProjectProposal> page = new Page<>(sp.getPageNum(),sp.getPageSize());
Page<SpecialProjectProposal> infoPage = specialProjectProposalMapper.selectPage(page, queryWrapper);
return infoPage;
}
}

Loading…
Cancel
Save