diff --git a/jwtech-admin-page/src/api/build/funds.js b/jwtech-admin-page/src/api/build/funds.js index c8680c6a..1fd5b849 100644 --- a/jwtech-admin-page/src/api/build/funds.js +++ b/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({ diff --git a/jwtech-admin-page/src/views/building/contract/options/evaluatePage.vue b/jwtech-admin-page/src/views/building/contract/options/evaluatePage.vue index 1c4a4674..15be3646 100644 --- a/jwtech-admin-page/src/views/building/contract/options/evaluatePage.vue +++ b/jwtech-admin-page/src/views/building/contract/options/evaluatePage.vue @@ -1,551 +1,566 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-admin-page/src/views/building/contract/options/honourAnAgreementPage.vue b/jwtech-admin-page/src/views/building/contract/options/honourAnAgreementPage.vue index 7accf55c..e06463ab 100644 --- a/jwtech-admin-page/src/views/building/contract/options/honourAnAgreementPage.vue +++ b/jwtech-admin-page/src/views/building/contract/options/honourAnAgreementPage.vue @@ -1,636 +1,544 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-admin-page/src/views/building/contract/options/index.vue b/jwtech-admin-page/src/views/building/contract/options/index.vue index 7d132585..2e5f32ae 100644 --- a/jwtech-admin-page/src/views/building/contract/options/index.vue +++ b/jwtech-admin-page/src/views/building/contract/options/index.vue @@ -59,7 +59,7 @@ :contractNumber="formData ? formData.contractNumber : ''" /> - - + --> diff --git a/jwtech-admin-page/src/views/building/firmInfo/index.vue b/jwtech-admin-page/src/views/building/firmInfo/index.vue index 018e1d5e..d9f504a7 100644 --- a/jwtech-admin-page/src/views/building/firmInfo/index.vue +++ b/jwtech-admin-page/src/views/building/firmInfo/index.vue @@ -492,7 +492,7 @@ @close="closeView" > -
企业信息
+
参建企业信息
{ 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; diff --git a/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue b/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue index df168983..be5e1c79 100644 --- a/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue +++ b/jwtech-admin-page/src/views/building/investment/options/purposeFunds.vue @@ -36,16 +36,7 @@ - + @@ -108,7 +99,27 @@ - + + + @@ -182,12 +193,12 @@ 修改 + >资金支付 - 删除 + >--> @@ -220,50 +231,108 @@ - + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - - + + - - + + + + + + + + + 点击上传 + +
+ 支持jpg/png/pdf/word/excel文件等，不超过100M +
+ + + + @@ -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); //创建新的URL表示指定的blob对象 + 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, + }); + }, + }, }; diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java index b1e64dc7..88dcc5b1 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiPurposeFundsController.java +++ b/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 queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("CONTRACT_NUMBER", contractNumber); + BsSgcJsjdBuiContInfo contInfo = bsSgcJsjdBuiContInfoService.getOne(queryWrapper); + return AjaxResult.success(contInfo.getId()); + + } + /** * 导出资金用途列表 diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java index d9fafaa2..02295195 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiPurposeFunds.java +++ b/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; /** 审核人 */ diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java index 04ab9997..8208b1d0 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectFeasibilityController.java +++ b/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 sp) { - return specialProjectFeasibilityService.selectPage(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); + } } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java index c5f15597..d97dd739 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectPreDesignController.java +++ b/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 sp) { - return specialProjectPreDesignService.selectPage(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); + } } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java index 7826e394..e63abd93 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java +++ b/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 sp) { - return specialProjectProposalService.selectPage(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); + } } /** diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java index 712df105..348503a9 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java +++ b/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; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java index 61abac9f..7fe140e9 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java +++ b/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; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java index ef0e7d15..3851812c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java +++ b/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; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java index 504fc101..e8fd7855 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java +++ b/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{ + @Autowired + private SpecialProjectFeasibilityMapper specialProjectFeasibilityMapper; + + + public IPage selectPage(SearchParam sp, String adcd) { + QueryWrapper 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 page = new Page<>(sp.getPageNum(),sp.getPageSize()); + Page infoPage = specialProjectFeasibilityMapper.selectPage(page, queryWrapper); + return infoPage; + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index ab2fe9ec..4c9b0412 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/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{ + @Autowired + private SpecialProjectPreDesignMapper specialProjectPreDesignMapper; + + public IPage selectPage(SearchParam sp, String adcd) { + + QueryWrapper 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 page = new Page<>(sp.getPageNum(),sp.getPageSize()); + Page infoPage = specialProjectPreDesignMapper.selectPage(page, queryWrapper); + return infoPage; + + + + } } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java index 7524a9ea..f45bfd3c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java +++ b/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 sp, String adcd) { + QueryWrapper 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 page = new Page<>(sp.getPageNum(),sp.getPageSize()); + Page infoPage = specialProjectProposalMapper.selectPage(page, queryWrapper); + return infoPage; + + } }