Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug更新

dev_kxc
zth 10 months ago
parent
31043873cf
commit
466134b97d
30 changed files with 477 additions and 1207 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      jwtech-admin-page/src/api/common.js
  2. 6
      jwtech-admin-page/src/api/warn/earlyWarning.js
  3. 544
      jwtech-admin-page/src/views/build/ eval/index.vue
  4. 571
      jwtech-admin-page/src/views/build/ handl/index.vue
  5. 20
      jwtech-admin-page/src/views/build/payable/index.vue
  6. 6
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
  7. 16
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/payroll.vue
  8. 10
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/firmInfo.vue
  9. 2
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
  10. 6
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
  11. 16
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue
  12. 6
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/firmInfo.vue
  13. 6
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
  14. 16
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue
  15. 31
      jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue
  16. 6
      jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
  17. 6
      jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
  18. 6
      jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
  19. 16
      jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue
  20. 4
      jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
  21. 23
      jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java
  22. 2
      jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java
  23. 23
      jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java
  24. 4
      jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java
  25. 2
      jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java
  26. 217
      jwtech-system/src/main/java/com/kms/system/controller/SysXzqhBfController.java
  27. 74
      jwtech-system/src/main/java/com/kms/system/domain/SysXzqhBf.java
  28. 16
      jwtech-system/src/main/java/com/kms/system/mapper/SysXzqhBfMapper.java
  29. 17
      jwtech-system/src/main/java/com/kms/system/service/SysXzqhBfService.java
  30. 4
      jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml

8
jwtech-admin-page/src/api/common.js
View File

@ -306,5 +306,11 @@ export function materialEntity(data) {
})
}
export function test(data){
return request({
url:'/test/user/test',
method:'post',
data:data
})
}

6
jwtech-admin-page/src/api/warn/earlyWarning.js
View File

@ -10,10 +10,10 @@ export function listProjectManage(query) {
})
}
// 导出
export function listProjectExport(query) {
export function listProjectExport(data) {
return request({
url: '/warn/projectManage/export',
method: 'post',
data: query
data:data
})
}
}

544
jwtech-admin-page/src/views/build/ eval/index.vue
View File

@ -1,544 +0,0 @@
<template>
<!-- 合同履约评价-->
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="阶段性交付成果" prop="phasedPaymentResults">
<el-input
v-model="queryParams.data.phasedPaymentResults"
placeholder="请输入阶段性交付成果"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同编号" prop="contractNumber">
<el-input
v-model="queryParams.data.contractNumber"
placeholder="请输入合同编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="评价描述" prop="evaluationDescription">
<el-input
v-model="queryParams.data.evaluationDescription"
placeholder="请输入评价描述"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前季度评价状态" prop="evaluationStatus">
<el-select
v-model="queryParams.data.evaluationStatus"
placeholder="请选择当前季度评价状态"
clearable
size="small"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="项目编码" prop="proCode">
<el-input
v-model="queryParams.data.proCode"
placeholder="请输入项目编码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目编号" prop="proNo">
<el-input
v-model="queryParams.data.proNo"
placeholder="请输入项目编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createUid">
<el-input
v-model="queryParams.data.createUid"
placeholder="请输入创建人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="UPDATE_UID" prop="updateUid">
<el-input
v-model="queryParams.data.updateUid"
placeholder="请输入UPDATE_UID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="UPDATE_UID" prop="updateTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.updateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择UPDATE_UID"
>
</el-date-picker>
</el-form-item>
<el-form-item label="数源部门" prop="owerDept">
<el-input
v-model="queryParams.data.owerDept"
placeholder="请输入数源部门"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="cyan"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['build: eval:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['build: eval:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['build: eval:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['build: eval:export']"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="evalList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column
label="阶段性交付成果"
align="center"
prop="phasedPaymentResults"
/>
<el-table-column
label="交付成果附件"
align="center"
prop="deliverablesAttachment"
/>
<el-table-column label="合同编号" align="center" prop="contractNumber" />
<el-table-column
label="评价描述"
align="center"
prop="evaluationDescription"
/>
<el-table-column
label="当前季度评价状态"
align="center"
prop="evaluationStatus"
/>
<el-table-column label="项目编码" align="center" prop="proCode" />
<el-table-column label="项目编号" align="center" prop="proNo" />
<el-table-column label="创建人" align="center" prop="createUid" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="UPDATE_UID" align="center" prop="updateUid" />
<el-table-column
label="UPDATE_UID"
align="center"
prop="updateTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="数源部门" align="center" prop="owerDept" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['build: eval:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['build: eval: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-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="阶段性交付成果" prop="phasedPaymentResults">
<el-input
v-model="form.phasedPaymentResults"
placeholder="请输入阶段性交付成果"
/>
</el-form-item>
<el-form-item label="交付成果附件" prop="deliverablesAttachment">
<el-input
v-model="form.deliverablesAttachment"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
<el-form-item label="合同编号" prop="contractNumber">
<el-input
v-model="form.contractNumber"
placeholder="请输入合同编号"
/>
</el-form-item>
<el-form-item label="评价描述" prop="evaluationDescription">
<el-input
v-model="form.evaluationDescription"
placeholder="请输入评价描述"
/>
</el-form-item>
<el-form-item label="当前季度评价状态">
<el-radio-group v-model="form.evaluationStatus">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="项目编码" prop="proCode">
<el-input v-model="form.proCode" placeholder="请输入项目编码" />
</el-form-item>
<el-form-item label="项目编号" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入项目编号" />
</el-form-item>
<el-form-item label="创建人" prop="createUid">
<el-input v-model="form.createUid" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="UPDATE_UID" prop="updateUid">
<el-input v-model="form.updateUid" placeholder="请输入UPDATE_UID" />
</el-form-item>
<el-form-item label="数源部门" prop="owerDept">
<el-input v-model="form.owerDept" placeholder="请输入数源部门" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listeval,
geteval,
deleval,
addeval,
updateeval,
exporteval,
} from "@/api/build/eval";
export default {
name: "eval",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 合同履约评价表格数据
evalList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
phasedPaymentResults: null,
deliverablesAttachment: null,
contractNumber: null,
evaluationDescription: null,
evaluationStatus: null,
proCode: null,
proNo: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
owerDept: null,
},
},
// 表单参数
form: {},
// 表单校验
rules: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询合同履约评价列表 */
getList() {
this.loading = true;
listeval(this.queryParams).then((response) => {
this.evalList = response.records;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
phasedPaymentResults: null,
deliverablesAttachment: null,
contractNumber: null,
evaluationDescription: null,
evaluationStatus: "0",
proCode: null,
proNo: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
owerDept: null,
};
this.resetForm("form");
},
// 查询表单重置
resetQueryForm() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
data: {
id: null,
phasedPaymentResults: null,
deliverablesAttachment: null,
contractNumber: null,
evaluationDescription: null,
evaluationStatus: "0",
proCode: null,
proNo: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
owerDept: null,
},
};
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;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加合同履约评价";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
geteval(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改合同履约评价";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateeval(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addeval(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 deleval(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {});
} else {
this.$message.warning("请选择要删除的数据！！");
}
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
let message = "是否确认导出所有的数据项?";
if (this.ids) {
message = "是否确认导出选中的数据项?";
queryParams.ids = this.ids;
}
this.$confirm(message, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return exporteval(queryParams);
})
.then((response) => {
this.downloadFile(response, true, response.msg);
// this.download(response.msg);
})
.catch(function () {});
},
},
};
</script>

571
jwtech-admin-page/src/views/build/ handl/index.vue
View File

@ -1,571 +0,0 @@
<template>
<!-- 安全风险处理结果-->
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="整改通知单信息" prop="rectificationNoticeInfo">
<el-input
v-model="queryParams.data.rectificationNoticeInfo"
placeholder="请输入整改通知单信息"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="整改时间" prop="rectificationTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.rectificationTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择整改时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="整改措施" prop="rectificationMeasures">
<el-input
v-model="queryParams.data.rectificationMeasures"
placeholder="请输入整改措施"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="整改状态" prop="rectificationStatus">
<el-select
v-model="queryParams.data.rectificationStatus"
placeholder="请选择整改状态"
clearable
size="small"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="整改前后图片对比结果" prop="rectificationResult">
<el-input
v-model="queryParams.data.rectificationResult"
placeholder="请输入整改前后图片对比结果"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="整改后审核信息" prop="rectificationAuditInfo">
<el-input
v-model="queryParams.data.rectificationAuditInfo"
placeholder="请输入整改后审核信息"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目编码" prop="proCode">
<el-input
v-model="queryParams.data.proCode"
placeholder="请输入项目编码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目编号" prop="proNo">
<el-input
v-model="queryParams.data.proNo"
placeholder="请输入项目编号"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建人" prop="createUid">
<el-input
v-model="queryParams.data.createUid"
placeholder="请输入创建人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-input
v-model="queryParams.data.createTime"
placeholder="请输入创建时间"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新人" prop="updateUid">
<el-input
v-model="queryParams.data.updateUid"
placeholder="请输入更新人"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="更新时间" prop="updateTime">
<el-input
v-model="queryParams.data.updateTime"
placeholder="请输入更新时间"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="数源部门" prop="owerDept">
<el-input
v-model="queryParams.data.owerDept"
placeholder="请输入数源部门"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="cyan"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['build: handl:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['build: handl:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['build: handl:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['build: handl:export']"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="handlList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column
label="整改通知单信息"
align="center"
prop="rectificationNoticeInfo"
/>
<el-table-column
label="整改时间"
align="center"
prop="rectificationTime"
width="180"
>
<template slot-scope="scope">
<span>{{
parseTime(scope.row.rectificationTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
<el-table-column
label="整改措施"
align="center"
prop="rectificationMeasures"
/>
<el-table-column
label="整改状态"
align="center"
prop="rectificationStatus"
/>
<el-table-column
label="整改前后图片对比结果"
align="center"
prop="rectificationResult"
/>
<el-table-column
label="整改后审核信息"
align="center"
prop="rectificationAuditInfo"
/>
<el-table-column label="项目编码" align="center" prop="proCode" />
<el-table-column label="项目编号" align="center" prop="proNo" />
<el-table-column label="创建人" align="center" prop="createUid" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="更新人" align="center" prop="updateUid" />
<el-table-column label="更新时间" align="center" prop="updateTime" />
<el-table-column label="数源部门" align="center" prop="owerDept" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['build: handl:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['build: handl: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-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="整改通知单信息" prop="rectificationNoticeInfo">
<el-input
v-model="form.rectificationNoticeInfo"
placeholder="请输入整改通知单信息"
/>
</el-form-item>
<el-form-item label="整改时间" prop="rectificationTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.rectificationTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择整改时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="整改措施" prop="rectificationMeasures">
<el-input
v-model="form.rectificationMeasures"
placeholder="请输入整改措施"
/>
</el-form-item>
<el-form-item label="整改状态">
<el-radio-group v-model="form.rectificationStatus">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="整改前后图片对比结果" prop="rectificationResult">
<el-input
v-model="form.rectificationResult"
placeholder="请输入整改前后图片对比结果"
/>
</el-form-item>
<el-form-item label="整改后审核信息" prop="rectificationAuditInfo">
<el-input
v-model="form.rectificationAuditInfo"
placeholder="请输入整改后审核信息"
/>
</el-form-item>
<el-form-item label="项目编码" prop="proCode">
<el-input v-model="form.proCode" placeholder="请输入项目编码" />
</el-form-item>
<el-form-item label="项目编号" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入项目编号" />
</el-form-item>
<el-form-item label="创建人" prop="createUid">
<el-input v-model="form.createUid" placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="更新人" prop="updateUid">
<el-input v-model="form.updateUid" placeholder="请输入更新人" />
</el-form-item>
<el-form-item label="数源部门" prop="owerDept">
<el-input v-model="form.owerDept" placeholder="请输入数源部门" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listhandl,
gethandl,
delhandl,
addhandl,
updatehandl,
exporthandl,
} from "@/api/build/handl";
export default {
name: " handl",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 安全风险处理结果表格数据
handlList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {
rectificationNoticeInfo: null,
rectificationTime: null,
rectificationMeasures: null,
rectificationStatus: null,
rectificationResult: null,
rectificationAuditInfo: null,
proCode: null,
proNo: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
owerDept: null,
},
},
// 表单参数
form: {},
// 表单校验
rules: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询安全风险处理结果列表 */
getList() {
this.loading = true;
listhandl(this.queryParams).then((response) => {
this.handlList = response.records;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
rectificationNoticeInfo: null,
rectificationTime: null,
rectificationMeasures: null,
rectificationStatus: "0",
rectificationResult: null,
rectificationAuditInfo: null,
proCode: null,
proNo: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
owerDept: null,
};
this.resetForm("form");
},
// 查询表单重置
resetQueryForm() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
data: {
id: null,
rectificationNoticeInfo: null,
rectificationTime: null,
rectificationMeasures: null,
rectificationStatus: "0",
rectificationResult: null,
rectificationAuditInfo: null,
proCode: null,
proNo: null,
createUid: null,
createTime: null,
updateUid: null,
updateTime: null,
owerDept: null,
},
};
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;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加安全风险处理结果";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
gethandl(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改安全风险处理结果";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updatehandl(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addhandl(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 delhandl(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {});
} else {
this.$message.warning("请选择要删除的数据！！");
}
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
let message = "是否确认导出所有的数据项?";
if (this.ids) {
message = "是否确认导出选中的数据项?";
queryParams.ids = this.ids;
}
this.$confirm(message, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return exporthandl(queryParams);
})
.then((response) => {
this.downloadFile(response, true, response.msg);
// this.download(response.msg);
})
.catch(function () {});
},
},
};
</script>

20
jwtech-admin-page/src/views/build/payable/index.vue
View File

@ -19,19 +19,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="务工人员身份证号" prop="idNo">
<el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="queryParams.data.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="务工人员身份证号" prop="name">
<el-form-item label="身份证号码" prop="name">
<el-input
v-model="queryParams.data.name"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -180,8 +180,8 @@
<el-table-column label="银行账户" align="center" prop="bankAccount" />
<el-table-column label="银行流水号" align="center" prop="bankSerialNumber" />
<el-table-column label="务工人员身份证号" align="center" prop="idNo" />
<el-table-column label="务工人员身份证号" align="center" prop="name" />
<el-table-column label="身份证号码" align="center" prop="idNo" />
<el-table-column label="身份证号码" align="center" prop="name" />
<el-table-column label="工资年月" align="center" prop="salaryTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.salaryTime, '{y}-{m}-{d}') }}</span>
@ -234,11 +234,11 @@
<el-form-item label="银行流水号" prop="bankSerialNumber">
<el-input v-model="form.bankSerialNumber" placeholder="请输入银行流水号" />
</el-form-item>
<el-form-item label="务工人员身份证号" prop="idNo">
<el-input v-model="form.idNo" placeholder="请输入务工人员身份证号" />
<el-form-item label="身份证号码" prop="idNo">
<el-input v-model="form.idNo" placeholder="请输入身份证号码" />
</el-form-item>
<el-form-item label="务工人员身份证号" prop="name">
<el-input v-model="form.name" placeholder="请输入务工人员身份证号" />
<el-form-item label="身份证号码" prop="name">
<el-input v-model="form.name" placeholder="请输入身份证号码" />
</el-form-item>
<el-form-item label="工资年月" prop="salaryTime">
<el-date-picker clearable size="small" style="width: 200px"

6
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
View File

@ -153,7 +153,7 @@
min-width="120"
/>
<el-table-column
label="社会信用社代码"
label="所属单位统一社会信用代码"
align="center"
prop="socialCreditCode"
min-width="120"
@ -298,10 +298,10 @@
placeholder="请输入提供担保单位名称"
/>
</el-form-item>
<el-form-item label="社会信用社代码" prop="socialCreditCode">
<el-form-item label="所属单位统一社会信用代码" prop="socialCreditCode">
<el-input
v-model="form.socialCreditCode"
placeholder="请输入社会信用社代码"
placeholder="请输入所属单位统一社会信用代码"
/>
</el-form-item>
<el-form-item label="担保开始日期" prop="guaranteeStartTime">

16
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/payroll.vue
View File

@ -24,19 +24,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="务工人员身份证号" prop="idNo">
<!-- <el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="queryParams.data.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="务工人员姓名" prop="name">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入务工人员姓名"
placeholder="请输入姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -194,13 +194,13 @@
min-width="120"
/>
<el-table-column
label="务工人员身份证号"
label="身份证号码"
align="center"
prop="idNo"
min-width="124"
/>
<el-table-column
label="务工人员姓名"
label="姓名"
align="center"
prop="name"
min-width="120"
@ -378,10 +378,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="务工人员身份证号" prop="idNo">
<el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="form.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
readonly
/>
</el-form-item>

10
jwtech-admin-page/src/views/building/projectInfo/projectProcess/firmInfo.vue
View File

@ -641,9 +641,9 @@ export default {
total: 0,
// 企业信息管理表格数据
firmInfo: {
projectLegalPerson: null,
projectLegalPhone: null,
projectLegalUnit: null,
projectLegalPerson: [],
projectLegalPhone: [],
projectLegalUnit: [],
enterpriseInfoList: [],
},
// 弹出层标题
@ -739,6 +739,10 @@ export default {
};
},
created() {
if (!this.proNo&&!this.proCode){
this.proNo=this.$route.query.proNo;
this.proCode=this.$route.query.proCode
}
if (this.proNo && this.proCode) this.getList();
},
// 父组件 利用axios请求得到的值 传送到子组件，要监听，否则初始渲染时为空

2
jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
View File

@ -256,6 +256,8 @@ export default {
},
created() {
this.routeList = JSON.parse(this.$store.state.basePageData.routeList);
this.activeName = this.$route.query.activeName?this.$route.query.activeName:'basePage';
console.log(this.routeList)
this.getList();
},
methods: {

6
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
View File

@ -153,7 +153,7 @@
min-width="120"
/>
<el-table-column
label="社会信用社代码"
label="所属单位统一社会信用代码"
align="center"
prop="socialCreditCode"
min-width="120"
@ -298,10 +298,10 @@
placeholder="请输入提供担保单位名称"
/>
</el-form-item>
<el-form-item label="社会信用社代码" prop="socialCreditCode">
<el-form-item label="所属单位统一社会信用代码" prop="socialCreditCode">
<el-input
v-model="form.socialCreditCode"
placeholder="请输入社会信用社代码"
placeholder="请输入所属单位统一社会信用代码"
/>
</el-form-item>
<el-form-item label="担保开始日期" prop="guaranteeStartTime">

16
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/payroll.vue
View File

@ -24,19 +24,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="务工人员身份证号" prop="idNo">
<!-- <el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="queryParams.data.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="务工人员姓名" prop="name">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入务工人员姓名"
placeholder="请输入姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -194,13 +194,13 @@
min-width="120"
/>
<el-table-column
label="务工人员身份证号"
label="身份证号码"
align="center"
prop="idNo"
min-width="124"
/>
<el-table-column
label="务工人员姓名"
label="姓名"
align="center"
prop="name"
min-width="120"
@ -378,10 +378,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="务工人员身份证号" prop="idNo">
<el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="form.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
readonly
/>
</el-form-item>

6
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/firmInfo.vue
View File

@ -623,9 +623,9 @@ export default {
total: 0,
// 企业信息管理表格数据
firmInfo: {
projectLegalPerson: null,
projectLegalPhone: null,
projectLegalUnit: null,
projectLegalPerson: [],
projectLegalPhone: [],
projectLegalUnit: [],
enterpriseInfoList: [],
},
// 弹出层标题

6
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
View File

@ -119,7 +119,7 @@
min-width="120"
/>
<el-table-column
label="社会信用社代码"
label="所属单位统一社会信用代码"
align="center"
prop="socialCreditCode"
min-width="120"
@ -250,10 +250,10 @@
placeholder="请输入单位名称"
/>
</el-form-item>
<el-form-item label="社会信用社代码" prop="socialCreditCode">
<el-form-item label="所属单位统一社会信用代码" prop="socialCreditCode">
<el-input
v-model="form.socialCreditCode"
placeholder="请输入社会信用社代码"
placeholder="请输入所属单位统一社会信用代码"
/>
</el-form-item>
<el-form-item label="担保开始日期" prop="guaranteeStartTime">

16
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/peasantWorkerSystem/options/payroll.vue
View File

@ -24,19 +24,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="务工人员身份证号" prop="idNo">
<!-- <el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="queryParams.data.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="务工人员姓名" prop="name">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入务工人员姓名"
placeholder="请输入姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -176,13 +176,13 @@
min-width="120"
/>
<el-table-column
label="务工人员身份证号"
label="身份证号码"
align="center"
prop="idNo"
min-width="124"
/>
<el-table-column
label="务工人员姓名"
label="姓名"
align="center"
prop="name"
min-width="120"
@ -323,10 +323,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="务工人员身份证号" prop="idNo">
<el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="form.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
readonly
/>
</el-form-item>

31
jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue
View File

@ -189,6 +189,10 @@
disabled
/>
</el-form-item> -->
<el-button class="Btn" @click="toCJ">跳转参建单位</el-button>
<el-button type="text" size="mini" style="position: absolute; right: 20px; color: red; cursor: default">
如无责任单位,请于参建单位补充
</el-button>
<el-form-item label="责任单位" prop="responsibleUnit">
<el-select
v-model="form.responsibleUnit"
@ -332,6 +336,7 @@ import { listInfo } from "@/api/build/enteInfo";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
import responsibleUnit from "./responsibleUnit.vue";
import firmInfo from '../../../building/projectInfo/projectProcess/firmInfo.vue'
export default {
name: "Rectification",
@ -489,7 +494,13 @@ export default {
listInfo(this.unitParams).then((response) => {
this.unitData = response.data;
this.unitOptions = response.data?.enterpriseInfoList;
this.unitOptions.push({
id: this.unitData.projectLegalPerson,
enterpriseName: this.unitData.projectLegalPerson,
enterpriseType: "9"
})
if (this.menuType == "0") {
this.unitOptions=[]
this.unitOptions.unshift({
id: this.unitData.projectLegalPerson,
enterpriseName: this.unitData.projectLegalPerson,
@ -612,6 +623,19 @@ export default {
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
toCJ(){
console.log(this.proNo)
this.$router.push({
path: '/building/projectInfo/projectProcess',
query: {
baseDataId:this.unitData.id,
activeName: 'firmInfo',
proNo:this.unitData.proNo,
proCode:this.unitData.proCode
}
})
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
@ -783,6 +807,13 @@ export default {
.myTooltips {
max-width: 60vw;
}
.Btn{
position: relative;
right: -1020px;
bottom: 40px;
}
</style>
<style lang="scss" scoped>
@import "@/assets/css/dialog.scss";

6
jwtech-admin-page/src/views/project/bid/options/PreQualificationPage.vue
View File

@ -463,7 +463,7 @@ export default {
},
projectNameFormat(row) {
if (row.bidProjectName) {
return row.bidProjectName.slice(0, row.bidProjectName.indexOf("["));
return row.bidProjectName;
}
},
// 表单重置
@ -528,7 +528,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.form.bidProjectName =
this.projectName + "[" + this.projectCode + "]";
this.projectName;
this.open = true;
this.title = "添加资格预审公告";
},
@ -537,8 +537,6 @@ export default {
const id = row.id || this.ids;
getBidPrequ(id).then((response) => {
this.form = response.data;
this.form.bidProjectName =
this.form.bidProjectName + "[" + this.form.projectCode + "]";
// 公告附件信息
console.log("response.data", response.data);
if (response.data.noticeAtttachment) {

6
jwtech-admin-page/src/views/project/bid/options/bidBasePage.vue
View File

@ -1249,7 +1249,7 @@ export default {
return this.selectDictLabel(this.isMustProject, row.isMustProject);
},
projectNameFormat(row) {
return row.bidProjectName.slice(0, row.bidProjectName.indexOf("["));
return row.bidProjectName
},
// 表单重置
reset() {
@ -1361,7 +1361,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.baseForm.bidProjectName =
this.projectName + "[" + this.projectCode + "]";
this.projectName;
this.open = true;
this.title = "添加招标计划基本信息";
},
@ -1372,8 +1372,6 @@ export default {
getBidInfoVO(id).then((response) => {
// console.log("666666666666", response);
this.baseForm = response.data.specialProjectBidInfo;
this.baseForm.bidProjectName =
this.baseForm.bidProjectName + "[" + this.baseForm.projectCode + "]";
if (response.data.specialProjectBidInfo.bidAttachment) {
this.fileList = JSON.parse(
response.data.specialProjectBidInfo.bidAttachment

6
jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue
View File

@ -119,7 +119,7 @@
min-width="120"
/>
<el-table-column
label="社会信用社代码"
label="所属单位统一社会信用代码"
align="center"
prop="socialCreditCode"
min-width="120"
@ -250,10 +250,10 @@
placeholder="请输入单位名称"
/>
</el-form-item>
<el-form-item label="社会信用社代码" prop="socialCreditCode">
<el-form-item label="所属单位统一社会信用代码" prop="socialCreditCode">
<el-input
v-model="form.socialCreditCode"
placeholder="请输入社会信用社代码"
placeholder="请输入所属单位统一社会信用代码"
/>
</el-form-item>
<el-form-item label="担保开始日期" prop="guaranteeStartTime">

16
jwtech-admin-page/src/views/projectStatistics/projectProcess/peasantWorkerSystem/options/payroll.vue
View File

@ -24,19 +24,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="务工人员身份证号" prop="idNo">
<!-- <el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="queryParams.data.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="务工人员姓名" prop="name">
<el-form-item label="姓名" prop="name">
<el-input
v-model="queryParams.cv.value"
placeholder="请输入务工人员姓名"
placeholder="请输入姓名"
clearable
size="small"
@keyup.enter.native="handleQuery"
@ -176,13 +176,13 @@
min-width="120"
/>
<el-table-column
label="务工人员身份证号"
label="身份证号码"
align="center"
prop="idNo"
min-width="124"
/>
<el-table-column
label="务工人员姓名"
label="姓名"
align="center"
prop="name"
min-width="120"
@ -323,10 +323,10 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="务工人员身份证号" prop="idNo">
<el-form-item label="身份证号码" prop="idNo">
<el-input
v-model="form.idNo"
placeholder="请输入务工人员身份证号"
placeholder="请输入身份证号码"
readonly
/>
</el-form-item>

4
jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java
View File

@ -107,7 +107,7 @@ public class WaterScheduled {
user.setMd5(MD5Util.MD5Encode(singleUser.toString(), "utf-8"));
}else {
String md = MD5Util.MD5Encode(singleUser.toString(), "utf-8");
if(user.getMd5()!=null&&md.equals(user.getMd5())){
if(user.getMd5()!=null&&!md.equals(user.getMd5())){
continue;
}
}
@ -125,7 +125,7 @@ public class WaterScheduled {
roles = roleService.listByIds(collect);
}
if(org!=null){
user.setDeptId(org.getId());
String type = singleUser.getType();
if(type.equals("GA")||type.equals("DEV_OPS")){ //政务机构

23
jwtech-pc/src/main/java/com/kms/web/controller/system/SysXzqhController.java
View File

@ -111,7 +111,28 @@ public class SysXzqhController extends BaseController
queryWrapper.likeRight("XZQHDM", substring);
List<SysXzqh> list = sysXzqhService.list(queryWrapper);
return AjaxResult.success(list);
}else {
}
// else if(xzqh.getLayer()==3){
// String substring = xzqh.getXzqhdm().substring(0, 6);
// QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// List<SysXzqh> list = sysXzqhService.list(queryWrapper);
// return AjaxResult.success(list);
// }else if (xzqh.getLayer()==4){
// String substring = xzqh.getXzqhdm().substring(0, 8);
// QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// List<SysXzqh> list = sysXzqhService.list(queryWrapper);
// return AjaxResult.success(list);
// }else if (xzqh.getLayer()==5){
// String substring = xzqh.getXzqhdm().substring(0, 10);
// QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
// queryWrapper.likeRight("XZQHDM", substring);
// List<SysXzqh> list = sysXzqhService.list(queryWrapper);
// return AjaxResult.success(list);
// }
else {
List<SysXzqh>list=new ArrayList<>();
list.add(xzqh);
return AjaxResult.success(list);

2
jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java
View File

@ -446,7 +446,7 @@ public class evaluateTask {
//工资保证金缴存滞后
@Scheduled(cron = "0 1 * * * ?")
@Scheduled(cron = "0 2 * * * ?")
public void noPayrollDeposit(){
List<BsSgcjsjdBuiProInfo> bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.selectList(null);
Date date=new Date();

23
jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectBidInfoController.java
View File

@ -3,10 +3,12 @@ package com.kms.earlyStage.controller;
import java.util.Arrays;
import java.util.List;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.utils.StringUtils;
import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
@ -90,9 +92,9 @@ public class SpecialProjectBidInfoController extends BaseController
{
SpecialProjectBidInfo byId = specialProjectBidInfoService.getById(id);
SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class)
.eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode()));
byId.setBidProjectName(one.getProjectName());
// SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class)
// .eq(SpecialProjectProposal::getProNo, byId.getProNo()).eq(SpecialProjectProposal::getProjectCode, byId.getProjectCode()));
// byId.setProjectName(one.getProjectName());
return AjaxResult.success(byId);
}
@ -161,9 +163,13 @@ public class SpecialProjectBidInfoController extends BaseController
@GetMapping("/listVO/{id}")
public AjaxResult getVO(@PathVariable String id) {
SpecialProjectBidInfo bidInfo = specialProjectBidInfoService.getById(id);
SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class)
.eq(SpecialProjectProposal::getProNo, bidInfo.getProNo()).eq(SpecialProjectProposal::getProjectCode, bidInfo.getProjectCode()));
bidInfo.setBidProjectName(one.getProjectName());
if (StringUtils.isEmpty(bidInfo.getBidProjectName())) {
SpecialProjectProposal one = specialProjectProposalService.getOne(Wrappers.lambdaQuery(SpecialProjectProposal.class)
.eq(SpecialProjectProposal::getProNo, bidInfo.getProNo()).eq(SpecialProjectProposal::getProjectCode, bidInfo.getProjectCode()));
if (ObjectUtil.isNotEmpty(bidInfo.getBidProjectName())) {
bidInfo.setBidProjectName(one.getProjectName());
}
}
String bidId = bidInfo.getBidId();
QueryWrapper<ProjectBidDetails> detailsQueryWrapper = new QueryWrapper<>();
@ -178,9 +184,4 @@ public class SpecialProjectBidInfoController extends BaseController
return AjaxResult.success(bidInfoVO);
}
}

4
jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectBidInfo.java
View File

@ -89,7 +89,9 @@ public class SpecialProjectBidInfo extends BaseEntity
private String bidId;
@TableField(exist = false)
private String proCode;
@TableField("project_name")
private String bidProjectName;
}

2
jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java
View File

@ -87,8 +87,6 @@ public class SpecialProjectBidInfoService extends BaseService<SpecialProjectBidI
IPage<SpecialProjectBidInfo> list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(),
(String) params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
return list;
}
}

217
jwtech-system/src/main/java/com/kms/system/controller/SysXzqhBfController.java
View File

@ -0,0 +1,217 @@
package com.kms.system.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.ArrayBlockingQueue;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jianwei.common.core.controller.BaseController;
import com.jianwei.common.core.domain.SearchParam;
import com.jianwei.common.utils.BeanUtils;
import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.build.domain.BsSgcJsjdBuiAttendanceInformation;
import com.kms.build.domain.BsSgcJsjdBuiRealName;
import com.kms.build.domain.vo.BsSgcJsjdBuiAttendanceInformationExcel;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.system.mapper.SysXzqhBfMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jianwei.common.mybaitsplus.BeanToWrapper;
import com.jianwei.common.annotation.Log;
import com.jianwei.common.core.domain.AjaxResult;
import com.jianwei.common.enums.BusinessType;
import com.kms.system.domain.SysXzqhBf;
import com.kms.system.service.SysXzqhBfService;
import org.springframework.web.multipart.MultipartFile;
/**
* 行政区划Controller
*
* @author kms
* @date 2024-06-28
*/
@RestController
@RequestMapping("/system/bf")
@Api(tags = "行政区划")
public class SysXzqhBfController extends BaseController
{
@Autowired
private SysXzqhBfService sysXzqhBfService;
@Autowired
private SysXzqhBfMapper sysXzqhBfMapper;
/**
* 查询行政区划列表
*/
@PostMapping("/list")
@ApiOperation("行政区划列表")
public IPage list(@RequestBody SearchParam<SysXzqhBf> sp)
{
return sysXzqhBfService.selectPage(sp);
}
/**
* 导出行政区划列表
*/
@Log(title = "行政区划导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("行政区划导出")
public AjaxResult export(@RequestBody SysXzqhBf sysXzqhBf)
{
List<SysXzqhBf> list = sysXzqhBfService.listByIds(sysXzqhBf.getIds());
ExcelUtil<SysXzqhBf> util = new ExcelUtil<>(SysXzqhBf.class);
return util.exportExcel(list, "bf");
}
@Log(title = "农民工人员考勤信息导入", businessType = BusinessType.EXPORT)
@PostMapping("/importData")
@ApiOperation("农民工人员考勤信息导入")
@Transactional
public AjaxResult importData(@RequestParam(value = "file") MultipartFile file){
try {
ExcelUtil<SysXzqhBf> util = new ExcelUtil<>(SysXzqhBf.class);
// 从 Excel 文件中导入数据
List<SysXzqhBf> list = util.importExcel(file.getInputStream());
// 创建一个线程池
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(10, 10, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<>(list.size()));
// 处理每一个导入的对象
for (SysXzqhBf bf : list) {
threadPoolExecutor.execute(() -> {
// 在保存之前设置额外的属性
bf.setId(bf.getXzqhdm());
bf.setType("1");
bf.setStatus("1");
// 在数据库中保存或更新对象
sysXzqhBfService.saveOrUpdate(bf);
});
}
// 关闭线程池
threadPoolExecutor.shutdown();
// 等待所有线程完成
threadPoolExecutor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
return AjaxResult.success("多线程插入操作成功完成");
}catch (Exception e){
e.printStackTrace();
}
return AjaxResult.success();
}
@PostMapping("/getLayer")
public AjaxResult getLayer(){
List<SysXzqhBf>list=sysXzqhBfService.list(new QueryWrapper<SysXzqhBf>()
.lambda().isNull(SysXzqhBf::getLayer));
//总数
// int size = list.size();
// //一次2000条
// int count = 200;
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(100, 100, 0, TimeUnit.SECONDS, new ArrayBlockingQueue<>(list.size()));
// int i = size % count == 0 ? size / count : size / count+1;
// for (int j = 0; j < i; j++) {
// int toIndex = (j + 1) * count;
// if (list.size() <= toIndex) {
// toIndex = list.size();
// }
// List<SysXzqhBf> list1 = list.subList(j * count, toIndex);
for (SysXzqhBf bf : list) {
threadPoolExecutor.execute(() -> {
Integer layer = 0;
Integer upgrades = upgrades(bf, layer);
bf.setLayer(upgrades);
sysXzqhBfService.saveOrUpdate(bf);
});
};
// 关闭线程池
threadPoolExecutor.shutdown();
// 等待所有线程完成
try {
threadPoolExecutor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
// }
return AjaxResult.success();
}
private Integer upgrades(SysXzqhBf sysXzqhBf,Integer layer){
while (ObjectUtil.isNotEmpty(sysXzqhBf)){
LambdaQueryWrapper<SysXzqhBf>lw=new LambdaQueryWrapper<>();
SysXzqhBf bf = sysXzqhBfMapper.selectOne(lw.eq(SysXzqhBf::getXzqhdm, sysXzqhBf.getParentid()));
layer++;
sysXzqhBf=bf;
}
return layer;
};
/**
* 获取行政区划详细信息
*/
@ApiOperation(" 行政区划详情")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return AjaxResult.success(sysXzqhBfService.getById(id));
}
/**
* 新增行政区划
*/
@Log(title = "行政区划新增", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation("行政区划新增")
public AjaxResult add(@RequestBody SysXzqhBf sysXzqhBf)
{
BaseEntityUtils.preInsert(sysXzqhBf);
return toAjax(sysXzqhBfService.save(sysXzqhBf));
}
/**
* 修改行政区划
*/
@ApiOperation("行政区划修改")
@Log(title = "行政区划修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysXzqhBf sysXzqhBf)
{
return toAjax(sysXzqhBfService.updateById(sysXzqhBf));
}
/**
* 删除行政区划
*/
@ApiOperation("行政区划删除")
@Log(title = "行政区划删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(sysXzqhBfService.removeByIds(Arrays.asList(ids)));
}
}

74
jwtech-system/src/main/java/com/kms/system/domain/SysXzqhBf.java
View File

@ -0,0 +1,74 @@
package com.kms.system.domain;
import java.math.BigDecimal;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jianwei.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jianwei.common.core.domain.BaseEntity;
/**
* 行政区划对象 sys_xzqh_bf
*
* @author kms
* @date 2024-06-28
*/
@TableName("sys_xzqh_bf")
@Data
@ApiModel("行政区划")
public class SysXzqhBf extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 行政区划代码 */
@Excel(name = "字典值")
@ApiModelProperty("行政区划代码")
private String xzqhdm;
/** 父级区划id */
@Excel(name = "父字典值")
@ApiModelProperty("父级区划id")
private String parentid;
/** 区划名称 */
@Excel(name = "字典标签")
@ApiModelProperty("区划名称")
private String name;
/** 层级 */
@Excel(name = "层级")
@ApiModelProperty("层级")
private Integer layer;
/** 类型 */
@Excel(name = "类型")
@ApiModelProperty("类型")
private String type;
/** 状态 */
@Excel(name = "状态")
@ApiModelProperty("状态")
private String status;
/** 排序 */
@Excel(name = "排序")
@ApiModelProperty("排序")
private BigDecimal orderno;
/** $column.columnComment */
@Excel(name = "排序")
@ApiModelProperty("排序")
private String createUid;
/** $column.columnComment */
@Excel(name = "排序")
@ApiModelProperty("排序")
private String updateUid;
}

16
jwtech-system/src/main/java/com/kms/system/mapper/SysXzqhBfMapper.java
View File

@ -0,0 +1,16 @@
package com.kms.system.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.kms.system.domain.SysXzqhBf;
/**
* 行政区划Mapper接口
*
* @author kms
* @date 2024-06-28
*/
@Repository
public interface SysXzqhBfMapper extends BaseMapper<SysXzqhBf> {
}

17
jwtech-system/src/main/java/com/kms/system/service/SysXzqhBfService.java
View File

@ -0,0 +1,17 @@
package com.kms.system.service;
import org.springframework.stereotype.Service;
import com.jianwei.common.core.service.BaseService;
import com.kms.system.mapper.SysXzqhBfMapper;
import com.kms.system.domain.SysXzqhBf;
/**
* 行政区划Service接口
*
* @author kms
* @date 2024-06-28
*/
@Service
public class SysXzqhBfService extends BaseService<SysXzqhBfMapper, SysXzqhBf>{
}

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

@ -6,8 +6,8 @@
<sql id="info">
select
project_name,
pp.project_code,
bi.project_name,
bi.project_code,
pp.project_type,
bi.*

Write Preview
Loading…
Cancel
Save