liweikun 1 year ago
parent
commit
6d9d75f13e
  1. 62
      jwtech-admin-page/src/api/warn/handle.js
  2. 10
      jwtech-admin-page/src/api/warn/projectBrief.js
  3. 53
      jwtech-admin-page/src/api/warn/result.js
  4. 5
      jwtech-admin-page/src/layout/components/Sidebar/Logo.vue
  5. 3
      jwtech-admin-page/src/settings.js
  6. 47
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue
  7. 15
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue
  8. 2
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/index.vue
  9. 13
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/index.vue
  10. 660
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue
  11. 1662
      jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue
  12. 442
      jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue
  13. 4
      jwtech-admin-page/src/views/loginbg.vue
  14. 6
      jwtech-admin-page/src/views/project/bid/index.vue
  15. 2
      jwtech-admin-page/src/views/project/special/options/basePage.vue
  16. 2
      jwtech-admin-page/vue.config.js
  17. 4
      jwtech-generator/src/main/resources/vm/vue/index.vue.vm
  18. 4
      jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java
  19. 7
      jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiGzjb.java
  20. 7
      jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java
  21. 13
      jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java
  22. 10
      jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java
  23. 9
      jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressService.java
  24. 35
      jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
  25. 10
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java
  26. 6
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java
  27. 7
      jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java
  28. 7
      jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java
  29. 8
      jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java
  30. 7
      jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java
  31. 7
      jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java
  32. 7
      jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java
  33. 9
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java
  34. 11
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java
  35. 16
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java
  36. 12
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java
  37. 12
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java
  38. 12
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java
  39. 11
      jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java
  40. 39
      jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java
  41. 16
      jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java
  42. 62
      jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java
  43. 7
      jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml
  44. 128
      jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
  45. 4
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml
  46. 6
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml
  47. 8
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml
  48. 5
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml
  49. 6
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml
  50. 5
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml

62
jwtech-admin-page/src/api/warn/handle.js

@ -0,0 +1,62 @@
import request from '@/utils/request'
// 查询预警基本信息
export function listHandleById(query) {
return request({
url: '/warn/handle/listById',
method: 'post',
data: query
})
}
// 查询预警处理列表
export function listHandle(query) {
return request({
url: '/warn/handle/list',
method: 'post',
data: query
})
}
// 查询预警处理详细
export function getHandle(id) {
return request({
url: '/warn/handle/' + id,
method: 'get'
})
}
// 新增预警处理
export function addHandle(data) {
return request({
url: '/warn/handle',
method: 'post',
data: data
})
}
// 修改预警处理
export function updateHandle(data) {
return request({
url: '/warn/handle',
method: 'put',
data: data
})
}
// 删除预警处理
export function delHandle(id) {
return request({
url: '/warn/handle/' + id,
method: 'delete'
})
}
// 导出预警处理
export function exportHandle(query) {
return request({
url: '/warn/handle/export',
method: 'get',
params: query
})
}

10
jwtech-admin-page/src/api/warn/projectBrief.js

@ -0,0 +1,10 @@
import request from '@/utils/request'
// 查询工作简报列表
export function listById(query) {
return request({
url: '/build/gzjb/listById',
method: 'post',
data: query
})
}

53
jwtech-admin-page/src/api/warn/result.js

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询预警结果列表
export function listResult(query) {
return request({
url: '/warn/result/list',
method: 'post',
data: query
})
}
// 查询预警结果详细
export function getResult(id) {
return request({
url: '/warn/result/' + id,
method: 'get'
})
}
// 新增预警结果
export function addResult(data) {
return request({
url: '/warn/result',
method: 'post',
data: data
})
}
// 修改预警结果
export function updateResult(data) {
return request({
url: '/warn/result',
method: 'put',
data: data
})
}
// 删除预警结果
export function delResult(id) {
return request({
url: '/warn/result/' + id,
method: 'delete'
})
}
// 导出预警结果
export function exportResult(query) {
return request({
url: '/warn/result/export',
method: 'get',
params: query
})
}

5
jwtech-admin-page/src/layout/components/Sidebar/Logo.vue

@ -35,9 +35,10 @@ export default {
}, },
data() { data() {
return { return {
title: "广东省水工程建设管理系统", title: "管理系统",
// title: '', // title: '',
logo: logoImg, // logo: logoImg,
logo: "",
}; };
}, },
created() { created() {

3
jwtech-admin-page/src/settings.js

@ -1,6 +1,5 @@
module.exports = { module.exports = {
// title: '安全知识图谱管理平台', title: '管理系统后台',
title: '广东省水工程建设管理系统后台',
/** /**
* 是否系统布局配置 * 是否系统布局配置

47
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue

@ -19,7 +19,16 @@
label-width="68px" label-width="68px"
> >
<el-form-item label="项目类型" prop="projectType"> <el-form-item label="项目类型" prop="projectType">
<el-select <el-cascader
v-model="queryParams.data.projectType"
:options="projectTypeoptions"
:props="projectTypeOptionProps"
placeholder="请选择项目类型"
clearable
size="small"
style="width: 100%"
></el-cascader>
<!-- <el-select
v-model="queryParams.data.projectType" v-model="queryParams.data.projectType"
placeholder="请选择项目类型" placeholder="请选择项目类型"
@change="handleQuery" @change="handleQuery"
@ -40,7 +49,7 @@
> >
</el-option> </el-option>
</el-option-group> </el-option-group>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="项目名称" prop="projectName"> <el-form-item label="项目名称" prop="projectName">
<el-input <el-input
@ -274,6 +283,10 @@ export default {
emitPath: false, emitPath: false,
checkStrictly: true, // checkStrictly: true, //
}, },
projectTypeOptionProps: {
emitPath: false,
checkStrictly: true, //
},
}; };
}, },
created() { created() {
@ -293,20 +306,46 @@ export default {
}, },
computed: { computed: {
projectTypeoptions() { projectTypeoptions() {
// let op = [
// {
// label: "",
// options: this.zd_projectTypeOptions,
// },
// {
// label: "",
// options: this.ms_projectTypeOptions,
// },
// ];
let op = [ let op = [
{ {
label: "重大项目", label: "重大项目",
options: this.zd_projectTypeOptions, value: "zd, ",
children: this.zd_projectTypeOptions.map((item) => {
return {
label: item.dictLabel,
value: "zd," + item.dictValue,
};
}),
}, },
{ {
label: "面上项目", label: "面上项目",
options: this.ms_projectTypeOptions, value: "ms, ",
children: this.ms_projectTypeOptions.map((item) => {
return {
label: item.dictLabel,
value: "ms," + item.dictValue,
};
}),
}, },
]; ];
// console.log(3333, op);
return op; return op;
}, },
}, },
methods: { methods: {
// aaaa(value) {
// console.log(99999, value);
// },
formatAdcd(row) { formatAdcd(row) {
if (row.adcd) { if (row.adcd) {
let provinceCode = row.adcd.slice(0, 2); let provinceCode = row.adcd.slice(0, 2);

15
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/index.vue

@ -26,13 +26,18 @@
<!-- 过程展示 --> <!-- 过程展示 -->
<processShow /> <processShow />
<div class="proTitle">项目信息</div> <div class="proTitle">
项目信息
<el-button type="primary" @click="openTabs = !openTabs">
{{ openTabs ? "收缩" : "展开" }}
</el-button>
</div>
<!-- <el-tabs <!-- <el-tabs
v-model="activeName" v-model="activeName"
@tab-click="handleClick" @tab-click="handleClick"
style="height: 750px; margin-bottom: 20px" style="height: 750px; margin-bottom: 20px"
> --> > -->
<el-tabs v-model="activeName" style="margin-bottom: 20px"> <el-tabs v-model="activeName" style="margin-bottom: 20px" v-if="openTabs">
<el-tab-pane label="项目基本信息" name="basePage"> <el-tab-pane label="项目基本信息" name="basePage">
<baseMsg :proNo="formData.proNo" :formData="formData" /> <baseMsg :proNo="formData.proNo" :formData="formData" />
</el-tab-pane> </el-tab-pane>
@ -159,6 +164,9 @@
/> />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="proTitle">预警信息</div>
<warnMsg />
</div> </div>
</template> </template>
<script> <script>
@ -176,6 +184,7 @@ import investment from "./investment/index.vue";
import peasantWorkerSystem from "./peasantWorkerSystem/index.vue"; import peasantWorkerSystem from "./peasantWorkerSystem/index.vue";
import projectAcceptance from "./projectAcceptance.vue"; import projectAcceptance from "./projectAcceptance.vue";
import processShow from "./processShow/index.vue"; import processShow from "./processShow/index.vue";
import warnMsg from "./warnMsg/index.vue";
import { import {
listInfo, listInfo,
@ -202,9 +211,11 @@ export default {
peasantWorkerSystem, peasantWorkerSystem,
projectAcceptance, projectAcceptance,
processShow, processShow,
warnMsg,
}, },
data() { data() {
return { return {
openTabs: false,
activeName: "basePage", activeName: "basePage",
routeList: [], routeList: [],
formData: {}, formData: {},

2
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/index.vue

@ -20,7 +20,7 @@
<el-tabs <el-tabs
v-model="activeName" v-model="activeName"
@tab-click="handleClick" @tab-click="handleClick"
style="height: 750px; margin-bottom: 20px" style="margin-bottom: 20px"
> >
<el-tab-pane label="资金下达" name="sourceFunds" :lazy="true"> <el-tab-pane label="资金下达" name="sourceFunds" :lazy="true">
<sourceFunds <sourceFunds

13
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/index.vue

@ -17,11 +17,7 @@
> >
</el-page-header> </el-page-header>
<el-tabs <el-tabs v-model="activeName" @tab-click="handleClick">
v-model="activeName"
@tab-click="handleClick"
style="height: 750px; margin-bottom: 20px"
>
<el-tab-pane label="资金来源" name="sourceFunds"> <el-tab-pane label="资金来源" name="sourceFunds">
<sourceFunds :formData="formData" ref="sourceFunds" /> <sourceFunds :formData="formData" ref="sourceFunds" />
</el-tab-pane> </el-tab-pane>
@ -33,13 +29,12 @@
> >
<purposeFunds /> <purposeFunds />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script> <script>
import sourceFunds from "@/views/building/investment/options/sourceFunds.vue"; import sourceFunds from "@/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/sourceFunds.vue";
import purposeFunds from "@/views/building/investment/options/purposeFunds.vue"; import purposeFunds from "@/views/evaluationEarlyWarning/earlyWarningManage/warning/options/investment/options/purposeFunds.vue";
import { import {
listFunds, listFunds,
@ -71,7 +66,7 @@ export default {
proCode: null, proCode: null,
proNo: null, proNo: null,
}, },
} },
}; };
}, },
created() { created() {

660
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue

@ -0,0 +1,660 @@
<template>
<div class="app-container">
<el-table v-loading="loading" :data="resultList">
<el-table-column
label="序号"
type="index"
width="50"
align="center"
fixed
/>
<!-- <el-table-column
label="项目名称"
align="center"
prop="projectName"
min-width="120"
/> -->
<el-table-column
label="预警事项"
align="center"
prop="warnType"
:formatter="warnTypeFormat"
min-width="120"
/>
<el-table-column
label="问题描述"
align="center"
prop="warnResult"
min-width="120"
/>
<el-table-column
label="预警状态"
align="center"
prop="resultType"
min-width="120"
/>
<el-table-column
label="流程节点"
align="center"
prop="111"
min-width="120"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="180"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="viewWarnInfo(scope.row)"
v-hasPermi="['warn:result:view']"
>查看</el-button
>
<!-- <el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['warn:result:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['warn:result:remove']"
>删除</el-button
> -->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 预警信息抽屉 -->
<el-drawer
title="预警信息"
:visible.sync="open"
direction="btt"
:before-close="handleClose"
>
<div class="baseForm">
<el-row class="hang">
<el-col :span="8">
<div class="itemLabel">工程名称</div>
<div class="itemContent">
{{ baseForm.projectName }}
</div>
</el-col>
<el-col :span="8">
<div class="itemLabel">建设单位</div>
<div class="itemContent">{{ baseForm.unit }}</div>
</el-col>
<el-col :span="8">
<div class="itemLabel">项目所在地</div>
<div class="itemContent">
{{ $formatAdcd({ adcd: baseForm.adcd }) }}
</div>
</el-col>
</el-row>
<el-row class="hang">
<el-col :span="8">
<div class="itemLabel">合同名称</div>
<div class="itemContent">
{{ baseForm.contractName }}
</div>
</el-col>
<el-col :span="8">
<div class="itemLabel">预警事项</div>
<div class="itemContent">
{{ baseForm.warnType }}
</div>
</el-col>
</el-row>
<el-row class="hang">
<el-col :span="8">
<div class="itemLabel">问题描述</div>
<div class="itemContent">
{{ baseForm.warnResult }}
</div>
</el-col>
</el-row>
</div>
<el-divider></el-divider>
<div class="node">
<div class="nodeTitle">预警节点</div>
<el-steps :active="2" simple>
<el-step title="预警产生" icon="el-icon-place"></el-step>
<el-step
title="预警处置"
icon="el-icon-edit"
@click.native="dealWarn"
style="cursor: pointer"
></el-step>
<el-step
title="水行政主管部分审核"
icon="el-icon-edit-outline"
style="cursor: pointer"
></el-step>
<el-step title="结束" icon="el-icon-circle-check"></el-step>
</el-steps>
</div>
<el-divider></el-divider>
<div class="course">
<div class="courseTitle">预警流程</div>
<el-timeline>
<el-timeline-item
:timestamp="baseForm.createTime"
color="#5AC920"
size="large"
>
预警产生
</el-timeline-item>
<el-timeline-item
:timestamp="warnForm.createTime"
color="#5AC920"
size="large"
v-if="!warnForm.id"
></el-timeline-item>
<el-timeline-item
:timestamp="warnForm.createTime"
color="#5AC920"
size="large"
v-if="warnForm.id"
>
<div>公司<span>已处理</span></div>
<div>
经办人<span>{{ warnForm.handleUser }}</span> 联系方式<span>{{
warnForm.handlePhone
}}</span>
</div>
<div>
审核人<span>{{ warnForm.checkUser }}</span> 联系方式<span>{{
warnForm.checkPhone
}}</span>
</div>
<div>
意见<span>{{ warnForm.opinion }}</span>
</div>
</el-timeline-item>
<el-timeline-item
timestamp="2018-04-22 14:23:30"
color="#E2A02F"
size="large"
v-if="warnForm.id"
>
结果
</el-timeline-item>
</el-timeline>
</div>
</el-drawer>
<!-- 预警处理 -->
<el-dialog
title="预警处理"
:visible.sync="warnOpen"
width="1000px"
append-to-body
:close-on-click-modal="false"
@close="close"
>
<el-form
ref="warnForm"
:model="warnForm"
:rules="warnRules"
label-width="110px"
>
<!-- <el-form-item label="" prop="resultId">
<el-input v-model="warnForm.resultId" placeholder="请输入" />
</el-form-item> -->
<el-form-item label="经办人" prop="handleUser">
<el-input v-model="warnForm.handleUser" placeholder="请输入经办人" />
</el-form-item>
<el-form-item label="经办人联系方式" prop="handlePhone">
<el-input v-model="warnForm.handlePhone" placeholder="请输入" />
</el-form-item>
<el-form-item label="审核人" prop="checkUser">
<el-input v-model="warnForm.checkUser" placeholder="请输入审核人" />
</el-form-item>
<el-form-item label="审核人联系方式" prop="checkPhone">
<el-input v-model="warnForm.checkPhone" placeholder="请输入" />
</el-form-item>
<el-form-item label="意见" prop="opinion">
<el-input
v-model="warnForm.opinion"
type="textarea"
rows="4"
placeholder="请输入意见"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitWarnForm"> </el-button>
<el-button @click="cancelWarn"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listResult,
getResult,
delResult,
addResult,
updateResult,
} from "@/api/warn/result";
import {
listHandleById,
listHandle,
getHandle,
delHandle,
addHandle,
updateHandle,
} from "@/api/warn/handle";
export default {
name: "Result",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
resultList: [],
//
title: "",
//
open: false,
//
warningItemsOptions: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
createUid: null,
updateUid: null,
proCode: null,
proNo: null,
owerDept: null,
warnType: null,
warnSubType: null,
resultType: null,
warnResult: null,
isHandle: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
handleParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
createUid: null,
updateUid: null,
proCode: null,
proNo: null,
owerDept: null,
resultId: null,
handleUser: null,
checkUser: null,
opinion: null,
handlePhone: null,
checkPhone: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
//
form: {},
baseForm: {},
//
rules: {},
warnForm: {},
warnRules: {},
warnOpen: false,
resultId: "",
};
},
created() {
this.getList();
this.getDicts("Warning_items").then((response) => {
this.warningItemsOptions = response.data;
});
},
methods: {
close() {
// this.warnForm = {};
// this.resultId = "";
},
dealWarn() {
this.warnOpen = true;
},
getWarnData(id) {
this.handleParams.data.resultId = id;
listHandle(this.handleParams).then((res) => {
// console.log(88888888888, res);
if (res.records[0]) {
this.warnForm = res.records[0];
}
});
},
viewWarnInfo(row) {
this.resultId = row.id;
this.getWarnData(this.resultId);
// console.log(1111, row);
let parmas = {
data: {
id: row.id,
proNo: row.proNo,
proCode: row.proCode,
},
};
listHandleById(parmas).then((response) => {
// console.log(4545, response);
this.baseForm = response;
// console.log(77777, this.baseForm);
this.open = true;
});
// console.log(6566465);
},
handleClose() {
this.open = false;
this.warnForm = {};
this.resultId = "";
},
//
warnTypeFormat(row, column) {
return this.selectDictLabel(this.warningItemsOptions, row.warnType);
},
/** 查询预警结果列表 */
getList() {
this.loading = true;
listResult(this.queryParams).then((response) => {
this.resultList = response.records;
// console.log(6666, this.resultList);
this.total = response.total;
this.loading = false;
});
},
// //
// cancel() {
// this.open = false;
// this.reset();
// },
//
reset() {
this.form = {
id: null,
createUid: null,
updateUid: null,
createTime: null,
updateTime: null,
proCode: null,
proNo: null,
owerDept: null,
remark: null,
warnType: null,
warnSubType: null,
resultType: null,
warnResult: null,
isHandle: null,
};
this.resetForm("form");
},
//
resetQueryForm() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
data: {
id: null,
createUid: null,
updateUid: null,
createTime: null,
updateTime: null,
proCode: null,
proNo: null,
owerDept: null,
remark: null,
warnType: null,
warnSubType: null,
resultType: null,
warnResult: null,
isHandle: null,
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetQueryForm();
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
submitWarnForm() {
this.$refs["warnForm"].validate((valid) => {
if (valid) {
if (this.warnForm.id != null) {
updateHandle(this.warnForm).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.warnOpen = false;
// this.getList();
this.getWarnData(this.resultId);
}
});
} else {
this.warnForm.resultId = this.resultId;
addHandle(this.warnForm).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.warnOpen = false;
// this.getList();
this.getWarnData(this.resultId);
}
});
}
}
});
},
cancelWarn() {
this.warnOpen = false;
},
/** 提交按钮 */
// submitForm() {
// this.$refs["form"].validate((valid) => {
// if (valid) {
// if (this.form.id != null) {
// updateResult(this.form).then((response) => {
// if (response.code === 200) {
// this.msgSuccess("");
// this.open = false;
// this.getList();
// }
// });
// } else {
// addResult(this.form).then((response) => {
// if (response.code === 200) {
// this.msgSuccess("");
// this.open = false;
// this.getList();
// }
// });
// }
// }
// });
// },
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
if (ids) {
this.$confirm("是否删除选中的数据?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return delResult(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {});
} else {
this.$message.warning("请选择要删除的数据!!");
}
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/css/dialog.scss";
//::v-deep {
// .el-dialog {
// margin-top: 10vh !important;
// }
//}
::v-deep.el-drawer__wrapper {
.el-drawer__open .el-drawer.btt {
animation: "btt-drawer-in" 1s 1ms;
}
.el-drawer {
position: absolute;
left: calc(50% - 45vw);
width: 90vw !important;
height: 95vh !important;
}
.el-drawer__header {
font-size: 25px;
color: #000;
font-weight: bold;
}
.el-drawer__body {
padding: 10px 20px 20px 20px;
.baseForm {
.hang {
margin-bottom: 20px;
display: flex;
align-items: stretch;
.el-col {
display: flex;
}
.itemLabel {
display: flex;
justify-content: center;
align-items: center;
padding: 10px;
width: 40%;
// height: 100%;
font-size: 14px;
background: #ccc;
}
.itemContent {
display: flex;
justify-content: center;
align-items: center;
padding: 10px;
text-align: center;
width: 60%;
// height: 100%;
font-size: 14px;
background: #efefef;
}
}
}
.node {
.nodeTitle {
margin-bottom: 10px;
font-size: 20px;
font-weight: bold;
}
.el-steps {
height: 150px;
}
}
.course {
.courseTitle {
margin-bottom: 10px;
font-size: 20px;
font-weight: bold;
}
.el-timeline-item {
padding-bottom: 40px;
}
}
}
}
</style>

1662
jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/index.vue

File diff suppressed because it is too large

442
jwtech-admin-page/src/views/evaluationEarlyWarning/projectBrief/options/index.vue

@ -0,0 +1,442 @@
<template>
<!-- 项目基本信息-->
<div class="app-container">
<!-- 面包屑 -->
<el-breadcrumb separator="/" style="margin-bottom: 20px">
<el-breadcrumb-item
v-for="(item, index) in routeList"
:key="item + index"
:to="{ path: item.path }"
>{{ item.routeName }}</el-breadcrumb-item
>
</el-breadcrumb>
<el-page-header
@back="goBack"
:content="routeList[0].routeName"
style="margin-bottom: 25px"
>
</el-page-header>
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.data.projectName"
placeholder="请输入项目名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<el-form-item label="行政区划" prop="projectName">
<el-cascader
:options="areasOptions"
v-model="queryParams.data.adcd"
:props="areasOptionProps"
placeholder="请选择行政区划"
clearable
size="small"
style="width: 100%"
@change="handleQuery"
>
</el-cascader>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="infoList"
border
class="exporttable"
:header-cell-style="{ borderColor: '#DFE6EC' }"
:cell-style="{ borderColor: '#DFE6EC' }"
>
<el-table-column
label="序号"
type="index"
width="50"
align="center"
fixed
/>
<el-table-column
label="项目名称"
align="center"
prop="projectName"
min-width="120"
fixed
/>
<el-table-column label="所在地" align="center" min-width="240" fixed>
<el-table-column
label="所在省"
align="center"
min-width="80"
prop="adcd"
:formatter="(row) => adcdFormat(row, 'province')"
fixed
/>
<el-table-column
label="所在市"
align="center"
min-width="80"
prop="adcd"
:formatter="(row) => adcdFormat(row, 'city')"
fixed
/>
<el-table-column
label="所在县"
align="center"
min-width="80"
prop="adcd"
:formatter="(row) => adcdFormat(row, 'county')"
fixed
/>
</el-table-column>
<el-table-column
label="工程等别"
align="center"
prop="engineeringGrade"
:formatter="engineeringGradeFormat"
min-width="120"
/>
<el-table-column label="库容" align="center" prop="22" min-width="120" />
<el-table-column label="初设批复情况" align="center" min-width="120">
<el-table-column label="批复文号" align="center" prop="1111" />
<el-table-column label="批复工期(月)" align="center" prop="222" />
<el-table-column label="初设批复投资" align="center" prop="333" />
</el-table-column>
<el-table-column
label="本年年度投资(万元)"
align="center"
min-width="120"
>
<el-table-column label="下达投资" align="center">
<el-table-column label="合计" align="center" prop="333" />
<el-table-column label="中央" align="center" prop="333" />
<el-table-column label="地方" align="center" prop="333" />
</el-table-column>
<el-table-column label="到位投资" align="center">
<el-table-column label="合计" align="center" prop="333" />
<el-table-column label="中央" align="center" prop="333" />
<el-table-column label="地方" align="center" prop="333" />
</el-table-column>
<el-table-column label="投资到位率(%)" align="center" prop="333" />
<el-table-column label="完成投资" align="center">
<el-table-column label="合计" align="center" prop="333" />
<el-table-column label="中央" align="center" prop="333" />
<el-table-column label="地方" align="center" prop="333" />
</el-table-column>
<el-table-column label="投资完成率" align="center" prop="333" />
</el-table-column>
<el-table-column
label="年内到位及完成(含结转 万元)"
align="center"
min-width="120"
>
<el-table-column label="投资到位" align="center">
<el-table-column label="合计" align="center" prop="333" />
<el-table-column label="中央" align="center" prop="333" />
<el-table-column label="地方" align="center" prop="333" />
</el-table-column>
<el-table-column label="完成投资" align="center">
<el-table-column label="合计" align="center" prop="333" />
<el-table-column label="中央" align="center" prop="333" />
<el-table-column label="地方" align="center" prop="333" />
</el-table-column>
</el-table-column>
<el-table-column
label="累计下达及完成(万元)"
align="center"
min-width="120"
>
<el-table-column label="下达投资" align="center">
<el-table-column label="合计" align="center" prop="xdTotal" />
<el-table-column
label="中央"
align="center"
prop="xdCenterPaidinAmount"
/>
<el-table-column
label="地方"
align="center"
prop="xdLandPaidnAmount"
/>
</el-table-column>
<el-table-column label="完成投资" align="center">
<el-table-column label="合计" align="center" prop="zfTotal" />
<el-table-column
label="中央"
align="center"
prop="zfCenterPaidinAmount"
/>
<el-table-column
label="地方"
align="center"
prop="zfLandPaidnAmount"
/>
</el-table-column>
<el-table-column label="投资完成率(%)" align="center" prop="333" />
</el-table-column>
<el-table-column label="用工(人天)" align="center" min-width="120">
<el-table-column label="农民工" align="center">
<el-table-column label="累计" align="center" prop="farmerTotal" />
<el-table-column label="本年" align="center" prop="farmerYear" />
<el-table-column label="2024年" align="center" prop="farmerNow" />
</el-table-column>
<el-table-column label="贫困人口用工" align="center">
<el-table-column label="累计" align="center" prop="333" />
<el-table-column label="本年" align="center" prop="333" />
<el-table-column label="2024年" align="center" prop="333" />
</el-table-column>
</el-table-column>
<el-table-column
label="是否主体工程施工招标"
align="center"
prop="isBelon"
/>
<el-table-column label="是否开工" align="center" prop="isStart" />
<el-table-column
label="(人天)建设时间节点"
align="center"
min-width="120"
>
<el-table-column
label="主体工程施工招标时间"
align="center"
prop="bidTime"
/>
<el-table-column label="开工时间" align="center" prop="startTime" />
<el-table-column label="完工时间" align="center" prop="endTime" />
</el-table-column>
<el-table-column label="是否完工" align="center" prop="isEnd" />
<el-table-column
label="工程进展是否滞后及其原因分析"
align="center"
prop="333"
/>
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listById } from "@/api/warn/projectBrief";
import { getInfo } from "@/api/build/projectInfo";
import { regionData, codeToText, TextToCode } from "element-china-area-data";
import { getAreasData } from "@/api/areas/index";
export default {
name: "Info",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
infoList: [],
//
engineeringGradeOptions: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
startDate: "2024-01-01",
endDate: "2024-04-01",
},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
//
form: {},
//
rules: {},
//
routeList: [],
areasOptions: [],
areasOptionProps: {
emitPath: false,
checkStrictly: true, //
},
};
},
created() {
this.getList();
this.getDicts("engineering_grade").then((response) => {
this.engineeringGradeOptions = response.data;
});
this.routeList = JSON.parse(this.$store.state.basePageData.routeList);
this.getTreeData();
},
methods: {
//
engineeringGradeFormat(row, column) {
return this.selectDictLabel(
this.engineeringGradeOptions,
row.engineeringGrade
);
},
adcdFormat(row, key) {
if (row.adcd) {
let provinceCode = row.adcd.slice(0, 2);
let cityCode = row.adcd.slice(2, 4);
let areaCode = row.adcd.slice(4, 6);
if (key === "province") return codeToText[provinceCode];
if (key === "city") return codeToText[provinceCode + cityCode];
if (key === "county")
return codeToText[provinceCode + cityCode + areaCode];
}
},
goBack() {
this.$router.back();
},
getTreeData() {
getAreasData().then((items) => {
// console.log("getAreasData", items.data);
let res = [];
let getChildren = (res, pid) => {
for (const i of items.data) {
if (i.parentid === pid) {
const newItem = {
label: i.name,
value: i.id,
};
if (i.layer != 3) newItem.children = [];
res.push(newItem);
getChildren(newItem.children, newItem.value);
}
}
};
getChildren(res, items.data[0].parentid);
// console.log(66666666666, res);
this.areasOptions = res;
// return res;
});
},
/** 查询项目基本信息管理列表 */
getList() {
this.loading = true;
getInfo(this.$route.query.baseDataId).then((response) => {
// console.log(2222, response);
this.queryParams.data.proNo = response.data.proNo;
this.queryParams.data.proCode = response.data.proCode;
listById(this.queryParams).then((res) => {
// console.log(1111, res);
this.infoList = res.records;
this.loading = false;
});
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {};
this.resetForm("form");
},
//
resetQueryForm() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
data: {},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetQueryForm();
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/css/dialog.scss";
::v-deep {
.el-dialog {
margin-top: 2vh !important;
}
.el-table__body-wrapper {
z-index: 2;
}
}
.exporttable {
border: solid 1px #dfe6ec;
}
</style>

4
jwtech-admin-page/src/views/loginbg.vue

@ -2,8 +2,8 @@
<div class="login"> <div class="login">
<div class="logo-text" style="text-align: center"> <div class="logo-text" style="text-align: center">
<!-- <img src="@/assets/image/bg/title.png" style="width: 579px" alt="" /> --> <!-- <img src="@/assets/image/bg/title.png" style="width: 579px" alt="" /> -->
<img src="@/assets/logo/logo-shuili.jpg" alt="" /> <!-- <img src="@/assets/logo/logo-shuili.jpg" alt="" /> -->
<span>广东省水工程建设管理系统</span> <span>管理系统</span>
</div> </div>
<div class="wrapper"> <div class="wrapper">

6
jwtech-admin-page/src/views/project/bid/index.vue

@ -14,7 +14,7 @@
<el-col :span="22"> <el-col :span="22">
<!-- 搜索条件 --> <!-- 搜索条件 -->
<el-form <el-form
:model="queryParams" :model="proQueryParams"
ref="proQueryParams" ref="proQueryParams"
:inline="true" :inline="true"
label-width="68px" label-width="68px"
@ -191,8 +191,8 @@
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="proQueryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="proQueryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div> </div>

2
jwtech-admin-page/src/views/project/special/options/basePage.vue

@ -399,9 +399,9 @@ export default {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
// this.open = false; // this.open = false;
// this.getList(); // this.getList();
this.$router.push("/project/special");
} }
}); });
this.$router.push("/project/special");
} }
} }
}); });

2
jwtech-admin-page/vue.config.js

@ -7,7 +7,7 @@ function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
const name = defaultSettings.title || '广东省水工程建设管理系统' // 标题 const name = defaultSettings.title || '管理系统' // 标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口

4
jwtech-generator/src/main/resources/vm/vue/index.vue.vm

@ -310,7 +310,7 @@ export default {
// 按哪个字段排序 // 按哪个字段排序
orderBy: "create_time", orderBy: "create_time",
// desc降序,升序asc // desc降序,升序asc
sort: "desc", sortBy: "desc",
}, },
}, },
// 表单参数 // 表单参数
@ -415,7 +415,7 @@ export default {
// 按哪个字段排序 // 按哪个字段排序
orderBy: "create_time", orderBy: "create_time",
// desc降序,升序asc // desc降序,升序asc
sort: "desc", sortBy: "desc",
}, },
}; };
this.resetForm("form"); this.resetForm("form");

4
jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java

@ -143,7 +143,7 @@ public class CommonController
String uploadFile = fastdfs.uploadFile(file); String uploadFile = fastdfs.uploadFile(file);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("fileName", fileName); ajax.put("fileName", fileName);
ajax.put("url", uploadFile); ajax.put("url", "");
return ajax; return ajax;
} else { } else {
// 上传文件路径 // 上传文件路径
@ -153,7 +153,7 @@ public class CommonController
String url = serverConfig.getUrl() + fileName; String url = serverConfig.getUrl() + fileName;
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("fileName", fileName); ajax.put("fileName", fileName);
ajax.put("url", url); ajax.put("url", "");
return ajax; return ajax;
} }

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

@ -1,6 +1,8 @@
package com.kms.build.domain; package com.kms.build.domain;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -58,5 +60,10 @@ public class BsSgcJsjdBuiGzjb extends BaseEntity
@Excel(name = "序号") @Excel(name = "序号")
@ApiModelProperty("序号") @ApiModelProperty("序号")
private String updateUid; private String updateUid;
@TableField(exist = false)
private String proNo;
@TableField(exist = false)
private String proCode;
} }

7
jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressMapper.java

@ -1,5 +1,7 @@
package com.kms.build.mapper; package com.kms.build.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.build.domain.BsSgcJsjdBuiProgress; import com.kms.build.domain.BsSgcJsjdBuiProgress;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -17,13 +19,12 @@ import java.util.List;
@Repository @Repository
public interface BsSgcJsjdBuiProgressMapper extends BaseMapper<BsSgcJsjdBuiProgress> { public interface BsSgcJsjdBuiProgressMapper extends BaseMapper<BsSgcJsjdBuiProgress> {
List<BsSgcJsjdBuiProgress> getProgress(@Param("userId") String userId, IPage<BsSgcJsjdBuiProgress> getProgress(@Param("userId") String userId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("id") String id, @Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("projectType") String projectType, @Param("projectType") String projectType,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
} }

13
jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@ -1,5 +1,7 @@
package com.kms.build.mapper; package com.kms.build.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.build.domain.BsSgcjsjdBuiProInfo; import com.kms.build.domain.BsSgcjsjdBuiProInfo;
import com.kms.build.domain.dto.AssertStatisticsDto; import com.kms.build.domain.dto.AssertStatisticsDto;
import com.kms.build.domain.dto.GzjbDto; import com.kms.build.domain.dto.GzjbDto;
@ -38,25 +40,28 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
List<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id, List<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("isMajor") String isMajor,
@Param("projectType") String projectType, @Param("projectType") String projectType,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize); @Param("pageSize") int pageSize);
List<AssertStatisticsDto> selectPageByCode(@Param("id") String id, IPage<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("projectType") String projectType, @Param("projectType") String projectType,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
List<GzjbDto> list(@Param("uerId") String id, List<GzjbDto> list(@Param("userId") String uerId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("startDate") Date startDate, @Param("startDate") Date startDate,
@Param("endDate") Date endDate, @Param("endDate") Date endDate,
@Param("proNo") String proNo,
@Param("proCode") String proCode,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize); @Param("pageSize") int pageSize);
} }

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

@ -53,13 +53,17 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
String adcd = sysDept.getXzqhId(); String adcd = sysDept.getXzqhId();
String id = sp.getId(); BsSgcJsjdBuiGzjb data = sp.getData();
BsSgcJsjdBuiGzjb bsSgcJsjdBuiGzjb = bsSgcJsjdBuiGzjbMapper.selectById(id);
List<GzjbDto> list = bsSgcjsjdBuiProInfoMapper.list(sysUser.getId(), sysUser.getUserType(), bsSgcJsjdBuiGzjb.getStartDate(), bsSgcJsjdBuiGzjb.getEndDate(), List<GzjbDto> list = bsSgcjsjdBuiProInfoMapper.list(sysUser.getId(), sysUser.getUserType(),
data.getStartDate(),
data.getEndDate(),
data.getProNo(),
data.getProCode(),
sysXzqhService.getSubString(adcd), sysXzqhService.getSubString(adcd),
"create_time",
sp.getPageNum(), sp.getPageSize()); sp.getPageNum(), sp.getPageSize());

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

@ -46,15 +46,12 @@ public class BsSgcJsjdBuiProgressService extends BaseService<BsSgcJsjdBuiProgres
assert sysUser != null; assert sysUser != null;
List<BsSgcJsjdBuiProgress> list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), IPage<BsSgcJsjdBuiProgress> list = bsSgcJsjdBuiProgressMapper.getProgress(sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(),
data.getProjectType(), data.getProjectType(),
sysXzqhService.getSubString(xzqhId), sysXzqhService.getSubString(xzqhId),
"create_time", sp.getPageNum(), sp.getPageSize()); "create_time",new Page<>(sp.getPageNum(), sp.getPageSize()));
Page<BsSgcJsjdBuiProgress> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());
return page; return list;
} }
} }

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

@ -154,17 +154,31 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
Map<String, Object> params = sp.getParams(); Map<String, Object> params = sp.getParams();
String isMajor = null;
String projectType = data.getProjectType();
if (!ObjectUtil.isNull(projectType)) {
String[] split = projectType.split(",");
isMajor=split[0];
if (" ".equals(split[1])) {
projectType=null;
}else {
projectType=split[1];
}
}
assert sysUser != null; assert sysUser != null;
List<BsSgcjsjdBuiProInfo> list = null; List<BsSgcjsjdBuiProInfo> list = null;
if (ObjectUtil.isNull(params)) {
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(),data.getProjectName(),data.getProjectType(), list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor,projectType,
sysXzqhService.getSubString(sp.getData().getAdcd()), sysXzqhService.getSubString(sp.getData().getAdcd()),
"create_time", sp.getPageNum(), sp.getPageSize()); "create_time", sp.getPageNum(), sp.getPageSize());
}else {
list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(),
data.getProjectName(),data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
}
for (BsSgcjsjdBuiProInfo buiProInfo : list) { for (BsSgcjsjdBuiProInfo buiProInfo : list) {
String proNo = buiProInfo.getProNo(); String proNo = buiProInfo.getProNo();
@ -201,19 +215,16 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
Map<String, Object> params = sp.getParams(); Map<String, Object> params = sp.getParams();
assert sysUser != null; assert sysUser != null;
List<AssertStatisticsDto> list = null; IPage<AssertStatisticsDto> list = null;
String deptId = sysUser.getDeptId(); String deptId = sysUser.getDeptId();
SysDept sysDept = sysDeptService.get(deptId); SysDept sysDept = sysDeptService.get(deptId);
String xzqhId = sysDept.getXzqhId(); String xzqhId = sysDept.getXzqhId();
list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(), data.getProjectName(), data.getProjectType(), list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(), data.getProjectName(), data.getProjectType(),
sysXzqhService.getSubString(xzqhId), sysXzqhService.getSubString(xzqhId),
"create_time",sp.getPageNum(),sp.getPageSize()); "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
Page<AssertStatisticsDto> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());
return page; return list;
} }
} }

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

@ -2,7 +2,9 @@ package com.kms.earlyStage.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.utils.poi.ExcelUtil; import com.jianwei.common.utils.poi.ExcelUtil;
@ -86,6 +88,14 @@ public class SpecialProjectGainController extends BaseController
public AjaxResult add(@RequestBody SpecialProjectGain specialProjectGain) public AjaxResult add(@RequestBody SpecialProjectGain specialProjectGain)
{ {
BaseEntityUtils.preInsert(specialProjectGain); BaseEntityUtils.preInsert(specialProjectGain);
String evaluationName = specialProjectGain.getEvaluationName();
List<SpecialProjectGain> list = specialProjectGainService.list(Wrappers.lambdaQuery(SpecialProjectGain.class)
.eq(SpecialProjectGain::getProNo,specialProjectGain.getProNo()));
List<SpecialProjectGain> collect = list.stream().filter(e -> e.getEvaluationName().equals(evaluationName)).collect(Collectors.toList());
if (collect.size() > 0) {
return AjaxResult.error("该评价规划名称已存在");
}
return toAjax(specialProjectGainService.save(specialProjectGain)); return toAjax(specialProjectGainService.save(specialProjectGain));
} }

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

@ -164,6 +164,12 @@ public class SpecialProjectInfoController extends BaseController {
public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo) { public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo) {
BaseEntityUtils.preInsert(specialProjectInfo); BaseEntityUtils.preInsert(specialProjectInfo);
String adcd = specialProjectInfo.getAdcd(); String adcd = specialProjectInfo.getAdcd();
String projectName = specialProjectInfo.getProjectName();
List<SpecialProjectInfo> list = specialProjectInfoService.list();
List<SpecialProjectInfo> infoList = list.stream().filter(x -> x.getProjectName().equals(projectName)).collect(Collectors.toList());
if (infoList.size() > 0) {
return AjaxResult.error("该项目已存在");
}
if (adcd == null) { if (adcd == null) {
SysUser user = UserUtils.getUser(); SysUser user = UserUtils.getUser();
String deptId = user.getDeptId(); String deptId = user.getDeptId();

7
jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java

@ -1,5 +1,7 @@
package com.kms.earlyStage.mapper; package com.kms.earlyStage.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -16,10 +18,9 @@ import java.util.List;
@Repository @Repository
public interface SpecialProjectBidInfoMapper extends BaseMapper<SpecialProjectBidInfo> { public interface SpecialProjectBidInfoMapper extends BaseMapper<SpecialProjectBidInfo> {
List<SpecialProjectBidInfo> getList(@Param("proNo") String proNo, IPage<SpecialProjectBidInfo> getList(@Param("proNo") String proNo,
@Param("isConsolidatedBidding") String isConsolidatedBidding, @Param("isConsolidatedBidding") String isConsolidatedBidding,
@Param("value") String value, @Param("value") String value,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
} }

7
jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java

@ -1,5 +1,7 @@
package com.kms.earlyStage.mapper; package com.kms.earlyStage.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -25,13 +27,12 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper<SpecialProje
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize); @Param("pageSize") int pageSize);
List<SpecialProjectFeasibility> getByUserPro(@Param("userId") String userId, IPage<SpecialProjectFeasibility> getByUserPro(@Param("userId") String userId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("id") String id, @Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("projectCode") String projectCode, @Param("projectCode") String projectCode,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
} }

8
jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java

@ -1,6 +1,7 @@
package com.kms.earlyStage.mapper; package com.kms.earlyStage.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -27,14 +28,13 @@ public interface SpecialProjectInfoMapper extends BaseMapper<SpecialProjectInfo>
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);*/ @Param("pageSize") int pageSize);*/
List<SpecialProjectInfo> getByUserPro(@Param("userId") String userId, IPage<SpecialProjectInfo> getByUserPro(IPage page,
@Param("userId") String userId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("id") String id, @Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("proNo") String proNO, @Param("proNo") String proNO,
@Param("projectType") String projectType, @Param("projectType") String projectType,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy);
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);
} }

7
jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java

@ -1,5 +1,7 @@
package com.kms.earlyStage.mapper; package com.kms.earlyStage.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -25,13 +27,12 @@ public interface SpecialProjectPlanInfoMapper extends BaseMapper<SpecialProjectP
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize);*/ @Param("pageSize") int pageSize);*/
List<SpecialProjectPlanInfo> getByUserPro(@Param("userId") String userId, IPage<SpecialProjectPlanInfo> getByUserPro(@Param("userId") String userId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("id") String id, @Param("id") String id,
@Param("planName") String planName, @Param("planName") String planName,
@Param("planType") String planType, @Param("planType") String planType,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
} }

7
jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java

@ -1,5 +1,7 @@
package com.kms.earlyStage.mapper; package com.kms.earlyStage.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -24,12 +26,11 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper<SpecialProject
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize); @Param("pageSize") int pageSize);
List<SpecialProjectPreDesign> getByUserPro(@Param("userId") String userId, IPage<SpecialProjectPreDesign> getByUserPro(@Param("userId") String userId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("id") String id, @Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
} }

7
jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java

@ -1,5 +1,7 @@
package com.kms.earlyStage.mapper; package com.kms.earlyStage.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.domain.SpecialProjectInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -28,13 +30,12 @@ public interface SpecialProjectProposalMapper extends BaseMapper<SpecialProjectP
@Param("pageNum") int pageNum, @Param("pageNum") int pageNum,
@Param("pageSize") int pageSize); @Param("pageSize") int pageSize);
List<SpecialProjectProposal> getByUserPro(@Param("userId") String userId, IPage<SpecialProjectProposal> getByUserPro(@Param("userId") String userId,
@Param("userType") String userType, @Param("userType") String userType,
@Param("id") String id, @Param("id") String id,
@Param("projectName") String projectName, @Param("projectName") String projectName,
@Param("projectCode") String projectCode, @Param("projectCode") String projectCode,
@Param("adcd") String adcd, @Param("adcd") String adcd,
@Param("orderBy") String orderBy, @Param("orderBy") String orderBy,
@Param("pageNum") int pageNum, Page page);
@Param("pageSize") int pageSize);
} }

9
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java

@ -84,14 +84,11 @@ public class SpecialProjectBidInfoService extends BaseService<SpecialProjectBidI
Map<String, Object> params = sp.getParams(); Map<String, Object> params = sp.getParams();
List<SpecialProjectBidInfo> list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(), IPage<SpecialProjectBidInfo> list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(),
(String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); (String) params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
Page<SpecialProjectBidInfo> page = new Page<>();
page.setRecords(list);
page.setTotal(list.size());
return page; return list;
} }
} }

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

@ -45,21 +45,18 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
ConditionView cv = sp.getCv(); ConditionView cv = sp.getCv();
assert sysUser != null; assert sysUser != null;
List<SpecialProjectFeasibility> list = null; IPage<SpecialProjectFeasibility> list = null;
if (ObjectUtil.isNull(params)) { if (ObjectUtil.isNull(params)) {
list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else { }else {
list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(), list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
} }
Page<SpecialProjectFeasibility> page = new Page<>(); return list;
page.setRecords(list);
page.setTotal(list.size());
return page;
} }
} }

16
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.core.domain.entity.SysUser; import com.jianwei.common.core.domain.entity.SysUser;
import com.kms.common.utils.UserUtils; import com.kms.common.utils.UserUtils;
@ -70,19 +71,18 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
assert sysUser != null; assert sysUser != null;
List<SpecialProjectInfo> list = null; List<SpecialProjectInfo> list = null;
IPage<SpecialProjectInfo> list1 = null;
if (ObjectUtil.isNull(params)) { if (ObjectUtil.isNull(params)) {
list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(), list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time");
} else { } else {
list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(), list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"));
} }
Page<SpecialProjectInfo> page = new Page<>();
page.setRecords(list); return list1;
page.setTotal(list.size());
return page;
} }
} }

12
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java

@ -40,20 +40,18 @@ public class SpecialProjectPlanInfoService extends BaseService<SpecialProjectPla
Map<String, Object> params = sp.getParams(); Map<String, Object> params = sp.getParams();
assert sysUser != null; assert sysUser != null;
List<SpecialProjectPlanInfo> list = null; IPage<SpecialProjectPlanInfo> list = null;
if (ObjectUtil.isNull(params)) { if (ObjectUtil.isNull(params)) {
list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(), list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(),
data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else { }else {
list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(), list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(),
data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
} }
Page<SpecialProjectPlanInfo> infoPage = new Page<>();
infoPage.setRecords(list); return list;
infoPage.setTotal(list.size());
return infoPage;
} }
} }

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

@ -46,7 +46,7 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
assert sysUser != null; assert sysUser != null;
List<SpecialProjectPreDesign> list = null; IPage<SpecialProjectPreDesign> list = null;
if (ObjectUtil.isNotNull(data.getProNo())) { if (ObjectUtil.isNotNull(data.getProNo())) {
return specialProjectPreDesignMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp)); return specialProjectPreDesignMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
@ -54,19 +54,15 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
if (ObjectUtil.isNull(params)) { if (ObjectUtil.isNull(params)) {
list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else { }else {
list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(), list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
} }
Page<SpecialProjectPreDesign> page = new Page<>(); return list;
page.setRecords(list);
page.setTotal(list.size());
return page;

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

@ -55,7 +55,7 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
Map<String, Object> params = sp.getParams(); Map<String, Object> params = sp.getParams();
assert sysUser != null; assert sysUser != null;
List<SpecialProjectProposal> list = null; IPage<SpecialProjectProposal> list = null;
if (ObjectUtil.isNull(data.getGetList())) { if (ObjectUtil.isNull(data.getGetList())) {
LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName()) LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName())
@ -68,16 +68,14 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
if (ObjectUtil.isNull(params)) { if (ObjectUtil.isNull(params)) {
list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(), list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(),
data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize()); data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
}else { }else {
list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(), list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(),
data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize()); data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
} }
Page<SpecialProjectProposal> page = new Page<>();
page.setRecords(list); return list;
page.setTotal(list.size());
return page;
} }

11
jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java

@ -45,6 +45,17 @@ public class BsSgcJsjdWarnResultHandleController extends BaseController
@Autowired @Autowired
private BsSgcJsjdWarnResultHandleService bsSgcJsjdWarnResultHandleService; private BsSgcJsjdWarnResultHandleService bsSgcJsjdWarnResultHandleService;
@PostMapping("/listById")
@ApiOperation("预警处理列表")
public BsSgcJsjdWarnResultHandle listById(@RequestBody SearchParam<BsSgcJsjdWarnResultHandle> sp)
{
return bsSgcJsjdWarnResultHandleService.listById(sp);
}
/** /**
* 查询预警处理列表 * 查询预警处理列表
*/ */

39
jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResult.java

@ -25,49 +25,34 @@ public class BsSgcJsjdWarnResult extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@ApiModelProperty("${comment}")
private String createUid; private String createUid;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@ApiModelProperty("${comment}")
private String updateUid; private String updateUid;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@ApiModelProperty("${comment}")
private String proCode; private String proCode;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@ApiModelProperty("${comment}")
private String proNo; private String proNo;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@ApiModelProperty("${comment}")
private String owerDept; private String owerDept;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") //预警事项
@ApiModelProperty("${comment}")
private String warnType; private String warnType;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@ApiModelProperty("${comment}")
private String warnSubType; private String warnSubType;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") //结果类型(1,不用处理。2,处理)
@ApiModelProperty("${comment}")
private String resultType; private String resultType;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") //问题描述
@ApiModelProperty("${comment}")
private String warnResult; private String warnResult;
/** 是否处理(0:未处理,1:已处理) */ /** 是否处理(0:未处理,1:已处理) */

16
jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java

@ -80,4 +80,20 @@ public class BsSgcJsjdWarnResultHandle extends BaseEntity
@ApiModelProperty("${comment}") @ApiModelProperty("${comment}")
private String checkPhone; private String checkPhone;
private String projectName;
private String unit;
private String adcd;
private String warnType;
private String warnResult;
} }

62
jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java

@ -1,10 +1,25 @@
package com.kms.warn.service; package com.kms.warn.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jianwei.common.core.domain.SearchParam;
import com.kms.build.domain.BsSgcJsjdBuiEnteInfo;
import com.kms.build.mapper.BsSgcJsjdBuiEnteInfoMapper;
import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper;
import com.kms.earlyStage.domain.SpecialProjectProposal;
import com.kms.earlyStage.mapper.SpecialProjectProposalMapper;
import com.kms.warn.domain.BsSgcJsjdWarnResult;
import com.kms.warn.mapper.BsSgcJsjdWarnResultMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.jianwei.common.core.service.BaseService; import com.jianwei.common.core.service.BaseService;
import com.kms.warn.mapper.BsSgcJsjdWarnResultHandleMapper; import com.kms.warn.mapper.BsSgcJsjdWarnResultHandleMapper;
import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; import com.kms.warn.domain.BsSgcJsjdWarnResultHandle;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/** /**
* 预警处理Service接口 * 预警处理Service接口
* *
@ -14,4 +29,51 @@ import com.kms.warn.domain.BsSgcJsjdWarnResultHandle;
@Service @Service
public class BsSgcJsjdWarnResultHandleService extends BaseService<BsSgcJsjdWarnResultHandleMapper, BsSgcJsjdWarnResultHandle>{ public class BsSgcJsjdWarnResultHandleService extends BaseService<BsSgcJsjdWarnResultHandleMapper, BsSgcJsjdWarnResultHandle>{
@Autowired
private BsSgcJsjdWarnResultHandleMapper bsSgcJsjdWarnResultHandleMapper;
@Autowired
private BsSgcJsjdWarnResultMapper bsSgcJsjdWarnResultMapper;
@Autowired
private BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper;
@Autowired
private SpecialProjectProposalMapper specialProjectProposalMapper;
@Autowired
private BsSgcJsjdBuiEnteInfoMapper bsSgcJsjdBuiEnteInfoMapper;
public BsSgcJsjdWarnResultHandle listById(SearchParam<BsSgcJsjdWarnResultHandle> sp) {
BsSgcJsjdWarnResultHandle data = sp.getData();
SpecialProjectProposal specialProjectProposal = specialProjectProposalMapper.selectOne(Wrappers.lambdaQuery(SpecialProjectProposal.class)
.eq(SpecialProjectProposal::getProNo, data.getProNo())
.eq(SpecialProjectProposal::getProjectCode, data.getProCode()));
String projectName = specialProjectProposal.getProjectName();
String adcd = specialProjectProposal.getAdcd();
List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoMapper.selectList(Wrappers.lambdaQuery(BsSgcJsjdBuiEnteInfo.class)
.eq(BsSgcJsjdBuiEnteInfo::getProNo, data.getProNo())
.eq(BsSgcJsjdBuiEnteInfo::getProCode, data.getProCode()));
List<BsSgcJsjdBuiEnteInfo> collect = bsSgcJsjdBuiEnteInfos.stream().filter(x -> x.getEnterpriseType().equals("1")).collect(Collectors.toList());
String enterpriseName = "";
if (collect.size() > 0) {
enterpriseName = collect.get(0).getEnterpriseName();
}
BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle = new BsSgcJsjdWarnResultHandle();
bsSgcJsjdWarnResultHandle.setAdcd(adcd);
bsSgcJsjdWarnResultHandle.setProjectName(projectName);
bsSgcJsjdWarnResultHandle.setUnit(enterpriseName);
return bsSgcJsjdWarnResultHandle;
}
} }

7
jwtech-system/src/main/resources/mapper/build/BsSgcJsjdBuiProgressMapper.xml

@ -20,13 +20,12 @@
<resultMap id="BsSgcjsjdBuiProgress" type="BsSgcjsjdBuiProgress"> <resultMap id="BsSgcjsjdBuiProgress" type="BsSgcjsjdBuiProgress">
<id column="id" property="id"/> <id column="id" property="id"/>
<result property="projectName" column="PROJECT_NAME"/> <result property="projectName" column="PROJECT_NAME"/>
<result property="projectName" column="project_type"/> <result property="projectType" column="project_type"/>
<result property="yearlyCumulativeWorkload" column="YEARLY_CUMULATIVE_WORKLOAD"/> <result property="yearlyCumulativeWorkload" column="YEARLY_CUMULATIVE_WORKLOAD"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
</resultMap> </resultMap>
<select id="getProgress" resultType="com.kms.build.domain.BsSgcJsjdBuiProgress"> <select id="getProgress" resultType="com.kms.build.domain.BsSgcJsjdBuiProgress">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include> <include refid="info"></include>
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
@ -47,7 +46,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by pi.${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
@ -59,7 +58,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by pi.${orderBy} desc
</if> </if>
</select> </select>
</mapper> </mapper>

128
jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@ -12,7 +12,8 @@
pi.project_type, pi.project_type,
pi.CONSTRUCTION_NATURE, pi.CONSTRUCTION_NATURE,
pi.is_major, pi.is_major,
pi.total pi.total,
pi.pro_no
from bs_sgc_jsjd_bui_pro_info pi from bs_sgc_jsjd_bui_pro_info pi
left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no left join bs_slgc_qqjd_spe_pro_proposal pp on pi.pro_code = pp.project_code and pi.pro_no = pp.pro_no
</sql> </sql>
@ -68,6 +69,7 @@
<result property="proCode" column="pro_code"/> <result property="proCode" column="pro_code"/>
<result property="constructionNature" column="CONSTRUCTION_NATURE"/> <result property="constructionNature" column="CONSTRUCTION_NATURE"/>
<result property="total" column="total"/> <result property="total" column="total"/>
<result property="proNo" column="pro_no"/>
</resultMap> </resultMap>
@ -161,6 +163,9 @@
<if test="projectName!=null and projectName!=''"> <if test="projectName!=null and projectName!=''">
and pi.project_name like concat('%',#{projectName},'%') and pi.project_name like concat('%',#{projectName},'%')
</if> </if>
<if test="isMajor!=null and isMajor!=''">
and pi.is_major=#{isMajor}
</if>
<if test="projectType!=null and projectType!=''"> <if test="projectType!=null and projectType!=''">
and pi.project_type=#{projectType} and pi.project_type=#{projectType}
</if> </if>
@ -238,31 +243,100 @@
<select id="list" resultMap="Gzjb"> <select id="list" resultMap="Gzjb">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
SELECT SELECT
t.ENGINEERING_GRADE, info.ENGINEERING_GRADE,
t.PRO_NO, info.PRO_NO,
t.PRO_CODE, info.PRO_CODE,
pp.ADCD, pro.ADCD,
pp.IS_BELONG_PLANNING, pro.IS_BELONG_PLANNING,
t.commencement_date, info.commencement_date,
pro.PROJECT_NAME,
ca.COMPLETION_ACCEPTANCE_TIME, ca.COMPLETION_ACCEPTANCE_TIME,
pbi.REPORT_TIME, pbi.REPORT_TIME,
sf.source_total,
sf.source_center,
sf.source_land,
pf.total
FROM
bs_sgc_jsjd_bui_pro_info info,
bs_slgc_qqjd_spe_pro_proposal pro
LEFT JOIN (
SELECT
COMPLETION_ACCEPTANCE_TIME,
PRO_NO,
pro_code
FROM
bs_sgc_jsjd_bui_com_acc ca
WHERE
ca.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND ca.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND ca.PRO_NO = #{proNo}
AND ca.pro_code = #{proCode}
) ca ON ca.PRO_NO = pro.PRO_NO
AND ca.PRO_CODE = pro.PROJECT_CODE
LEFT JOIN (
SELECT
REPORT_TIME,
PRO_NO,
project_code
FROM
bs_slgc_qqjd_pro_bid_info pbi
WHERE
pbi.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND pbi.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND pbi.PRO_NO = #{proNo}
AND pbi.project_code = #{proCode}
) pbi ON pbi.PRO_NO = pro.PRO_NO
AND pbi.project_code = pro.PROJECT_CODE
LEFT JOIN (
SELECT
SUM( sf.release_funds ) AS source_total, SUM( sf.release_funds ) AS source_total,
SUM( sf.CENTRAL_ARRANGED_FUNDS ) AS source_center, SUM( sf.CENTRAL_ARRANGED_FUNDS ) AS source_center,
SUM(sf.PROVINCIAL_FUNDING + sf.CITY_LEVEL_FUNDS + sf.COUNTY_LEVEL_FUNDS + sf.TOWNSHIP_INVESTMENTS) AS SUM( sf.PROVINCIAL_FUNDING + sf.CITY_LEVEL_FUNDS + sf.COUNTY_LEVEL_FUNDS + sf.TOWNSHIP_INVESTMENTS ) AS source_land,
source_land, PRO_NO,
SUM(pf.center_paidin_amount+pf.provincial_paidin_amount+pf.city_paidin_amount+pf.county_paidin_amount+pf.township_paidin_amount) pro_code
total
FROM FROM
(SELECT ENGINEERING_GRADE, PRO_NO, PRO_CODE, commencement_date FROM bs_sgc_jsjd_bui_pro_info bs_sgc_jsjd_bui_source_funds sf
WHERE CREATE_TIME BETWEEN #{startDate} AND #{endDate}) t WHERE
LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON t.PRO_CODE = pp.PROJECT_CODE AND t.PRO_NO = pp.PRO_NO sf.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
LEFT JOIN bs_sgc_jsjd_bui_com_acc ca ON ca.PRO_CODE = t.PRO_CODE AND ca.PRO_NO = t.PRO_NO AND sf.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
LEFT JOIN bs_slgc_qqjd_pro_bid_info pbi ON pbi.PROJECT_CODE = t.PRO_CODE AND pbi.PRO_NO = t.PRO_NO AND sf.PRO_NO = #{proNo}
LEFT JOIN bs_sgc_jsjd_bui_source_funds sf ON sf.PRO_CODE = t.PRO_CODE AND sf.PRO_NO = t.PRO_NO AND sf.pro_code = #{proCode}
LEFT JOIN bs_sgc_jsjd_bui_cont_info ci ON ci.PRO_CODE = t.PRO_CODE AND ci.PRO_NO = t.PRO_NO ) sf ON ca.PRO_NO = pro.PRO_NO
LEFT JOIN bs_sgc_jsjd_bui_purpose_funds pf ON ci.CONTRACT_NUMBER=pf.CONTRACT_NUMBER AND ca.PRO_CODE = pro.PROJECT_CODE
LEFT JOIN (
SELECT
CONTRACT_NUMBER,
PRO_NO,
pro_code
FROM
bs_sgc_jsjd_bui_cont_info ci
WHERE
ci.CREATE_TIME &gt; DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
AND ci.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND ci.PRO_NO = #{proNo}
AND ci.pro_code = #{proCode}
) ci ON ci.PRO_NO = pro.PRO_NO
AND ci.PRO_CODE = pro.PROJECT_CODE
LEFT JOIN (
SELECT
SUM( pf.center_paidin_amount + pf.provincial_paidin_amount + pf.city_paidin_amount + pf.county_paidin_amount + pf.township_paidin_amount ) total,
PRO_NO,
pro_code,
CONTRACT_NUMBER
FROM
bs_sgc_jsjd_bui_purpose_funds pf
WHERE
pf.CREATE_TIME &gt; DATE_FORMAT( #{startDate},'%Y-%m-%d' )
AND pf.CREATE_TIME &lt; DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
AND pf.PRO_NO = #{proNo}
AND pf.pro_code = #{proCode}
) pf ON ci.CONTRACT_NUMBER = pf.CONTRACT_NUMBER
WHERE
info.PRO_NO = pro.PRO_NO
AND info.PRO_CODE = pro.PROJECT_CODE
AND info.PRO_NO = #{proNo}
AND info.pro_code = #{proCode}
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
pi.PRO_NO IN ( pi.PRO_NO IN (
@ -275,17 +349,21 @@
AND user_id=#{userId}) AND user_id=#{userId})
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <if test="adcd!=null and adcd !=''">
and adcd like concat(#{adcd},'%')
</if>
</where> </where>
order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by pi.${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <if test="adcd!=null and adcd !=''">
and adcd like concat(#{adcd},'%')
</if>
</where> </where>
order by pi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
</if> </if>
GROUP BY t.PRO_CODE GROUP BY info.PRO_CODE
</select> </select>
</mapper> </mapper>

4
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml

@ -33,7 +33,7 @@
<select id="getList" resultMap="SpecialProjectBidInfo"> <select id="getList" resultMap="SpecialProjectBidInfo">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"/> <include refid="info"/>
<where> <where>
<if test="proNo!=null and proNo!=''"> <if test="proNo!=null and proNo!=''">
@ -46,7 +46,7 @@
and BID_PLAN_NAME like concat('%',#{value},'%') and BID_PLAN_NAME like concat('%',#{value},'%')
</if> </if>
</where> </where>
order by bi.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by bi.${orderBy} desc
</select> </select>

6
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

@ -45,7 +45,7 @@
order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize};
</select> </select>
<select id="getByUserPro" resultMap="SpecialProjectFeasibility"> <select id="getByUserPro" resultMap="SpecialProjectFeasibility">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="SpecialProjectInfo"/> <include refid="SpecialProjectInfo"/>
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
@ -66,7 +66,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
@ -78,7 +78,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
</select> </select>
</mapper> </mapper>

8
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml

@ -66,7 +66,6 @@
</select>--> </select>-->
<select id="getByUserPro" resultMap="SpecialProjectInfo"> <select id="getByUserPro" resultMap="SpecialProjectInfo">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include> <include refid="info"></include>
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
@ -90,7 +89,8 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
@ -105,9 +105,9 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if>
</if>
</select> </select>
</mapper> </mapper>

5
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml

@ -32,7 +32,6 @@
</resultMap> </resultMap>
<select id="getByUserPro" resultMap="info"> <select id="getByUserPro" resultMap="info">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="SpecialProjectPlanInfo"></include> <include refid="SpecialProjectPlanInfo"></include>
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
@ -53,7 +52,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
@ -65,7 +64,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
</select> </select>

6
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml

@ -47,7 +47,7 @@
</select> </select>
<select id="getByUserPro" resultMap="SpecialProjectPreDesign"> <select id="getByUserPro" resultMap="SpecialProjectPreDesign">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"/> <include refid="info"/>
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
@ -66,7 +66,7 @@
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by da.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by da.${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
@ -76,7 +76,7 @@
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by da.${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by da.${orderBy} desc
</if> </if>
</select> </select>
</mapper> </mapper>

5
jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml

@ -64,7 +64,6 @@
<select id="getByUserPro" resultMap="SpecialProjectProposal"> <select id="getByUserPro" resultMap="SpecialProjectProposal">
<bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
<include refid="info"></include> <include refid="info"></include>
<if test="userType==01"> <if test="userType==01">
WHERE WHERE
@ -85,7 +84,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
<if test="userType==00"> <if test="userType==00">
<where> <where>
@ -97,7 +96,7 @@
</if> </if>
<include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include> <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
</where> </where>
order by ${orderBy} desc LIMIT #{pageNum},#{pageSize}; order by ${orderBy} desc
</if> </if>
</select> </select>
</mapper> </mapper>

Loading…
Cancel
Save