Browse Source

Merge remote-tracking branch 'origin/master'

master
wuxu 1 month ago
parent
commit
113ad2c5dd
  1. 2
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
  2. 18
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
  3. 2
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
  4. 6
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
  5. 20
      jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
  6. 2
      jwtech-admin-page/vue.config.js
  7. 2
      jwtech-pc-page/config/index.js
  8. 8
      jwtech-pc-page/src/api/enterpriseInformation.js
  9. 29
      jwtech-pc-page/src/views/announcement/index.vue
  10. 84
      jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
  11. 4
      jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue
  12. 3
      jwtech-pc-page/src/views/home/components/statisticsRight.vue
  13. 9
      jwtech-pc-page/src/views/home/components/userLogin.vue
  14. 44
      jwtech-pc-page/src/views/home/index.vue
  15. 28
      jwtech-pc-page/src/views/policyDoc/components/docWrap.vue
  16. 27
      jwtech-pc-page/src/views/policyDoc/index.vue
  17. 21
      jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
  18. 3
      jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java
  19. 17
      jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java
  20. 2
      jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

2
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue

@ -15,7 +15,7 @@
<td><span class="label">开工日期</span>{{ projectInfo.commencementDate }}</td> <td><span class="label">开工日期</span>{{ projectInfo.commencementDate }}</td>
<td colspan="2"> <td colspan="2">
<span class="label">开设工资专用账户时间{{ projectInfo.payrollAccountTime }}</span> <span class="label">开设工资专用账户时间{{ projectInfo.payrollAccountTime }}</span>
<span style="color: green" v-if="projectInfo.balanceWarning=='(工资专用账户按要求在开工开始30天内创建)'">{{ projectInfo.dedicatedAccountWarning }}</span> <span style="color: green" v-if="projectInfo.dedicatedAccountWarning=='(工资专用账户按要求在开工开始30天内创建)'">{{ projectInfo.dedicatedAccountWarning }}</span>
<span style="color: red" v-else>{{ projectInfo.dedicatedAccountWarning }}</span> <span style="color: red" v-else>{{ projectInfo.dedicatedAccountWarning }}</span>
</td> </td>

18
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue

@ -413,7 +413,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="统计证信息" prop="certificateInformation"> <el-form-item label="信用承诺书" prop="certificateInformation" style="position: relative;">
<el-upload <el-upload
class="upload-demo" class="upload-demo"
action="thinking/common/upload" action="thinking/common/upload"
@ -437,6 +437,9 @@
支持jpg/png/pdf/word/excel文件等不超过200M 支持jpg/png/pdf/word/excel文件等不超过200M
</div> </div>
</el-upload> </el-upload>
<span @click=" downloadTemplate('项目法人版广东省智慧水利一期-水工程建设管理模块操作手册.pdf',
'(项目法人版)广东省智慧水利一期-水工程建设管理模块操作手册.pdf')" style="color: #2679bc;font-size: 14px;position: absolute;top: 10px;
left: 120px;cursor: pointer;">下载模板</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -683,6 +686,15 @@ export default {
}); });
}, },
methods: { methods: {
downloadTemplate(filename, name){
let a = document.createElement("a");
console.log(999, process.env.NODE_ENV);
a.href = "/jgThinking/static/" + filename;
// a.href = "/jgThinking/static/" + filename;
//'/'index.html
a.download = name;
a.click();
},
// //
enterpriseTypeFormat(row, column) { enterpriseTypeFormat(row, column) {
return this.selectDictLabel( return this.selectDictLabel(
@ -753,6 +765,9 @@ export default {
if (this.form.safetyProductionAttachment) { if (this.form.safetyProductionAttachment) {
this.fileList2 = JSON.parse(this.form.safetyProductionAttachment); this.fileList2 = JSON.parse(this.form.safetyProductionAttachment);
} }
if (this.form.certificateInformation){
this.fileList5=JSON.parse(this.form.certificateInformation)
}
}); });
}, },
// //
@ -847,6 +862,7 @@ export default {
if (valid) { if (valid) {
this.form.socialCreditCodeAttachment = JSON.stringify(this.fileList1); this.form.socialCreditCodeAttachment = JSON.stringify(this.fileList1);
this.form.safetyProductionAttachment = JSON.stringify(this.fileList2); this.form.safetyProductionAttachment = JSON.stringify(this.fileList2);
this.form.certificateInformation=JSON.stringify(this.fileList5)
if (this.form.id != null) { if (this.form.id != null) {
updateEnterpriseInfo(this.form).then((response) => { updateEnterpriseInfo(this.form).then((response) => {
if (response.code === 200) { if (response.code === 200) {

2
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue

@ -190,7 +190,7 @@
v-model="form.qualificationCategory" v-model="form.qualificationCategory"
placeholder="请选择资质类别" placeholder="请选择资质类别"
style="width: 100%" style="width: 100%"
disabled
> >
<el-option <el-option
v-for="dict in parentOption" v-for="dict in parentOption"

6
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue

@ -290,7 +290,7 @@
v-model="form.qualificationCategory" v-model="form.qualificationCategory"
placeholder="请选择资质类型" placeholder="请选择资质类型"
style="width: 100%" style="width: 100%"
disabled
> >
<el-option <el-option
v-for="dict in qualificationCategoryOptions" v-for="dict in qualificationCategoryOptions"
@ -413,7 +413,7 @@
v-model="form.isWaterCon" v-model="form.isWaterCon"
placeholder="请选择是否是" placeholder="请选择是否是"
style="width: 100%" style="width: 100%"
disabled
> >
<el-option <el-option
v-for="dict in isOptions" v-for="dict in isOptions"
@ -430,7 +430,7 @@
v-model="form.isWaterCon" v-model="form.isWaterCon"
placeholder="请选择是否" placeholder="请选择是否"
style="width: 100%" style="width: 100%"
disabled
> >
<el-option <el-option
v-for="dict in isOptions" v-for="dict in isOptions"

20
jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue

@ -51,6 +51,16 @@
> >
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
</el-form>
</el-col>
<el-col :span="16">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
>
<el-form-item label="是否有拖欠工资" prop="isMajorProject"> <el-form-item label="是否有拖欠工资" prop="isMajorProject">
<el-select <el-select
v-model="queryParams.data.isUnPay" v-model="queryParams.data.isUnPay"
@ -68,15 +78,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form>
</el-col>
<el-col :span="16">
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
>
<el-form-item label="是否省重大水利工程项目" prop="isMajorProject"> <el-form-item label="是否省重大水利工程项目" prop="isMajorProject">
<el-select <el-select
v-model="queryParams.data.isMajorProject" v-model="queryParams.data.isMajorProject"
@ -468,6 +469,7 @@ export default {
this.totalLoading=true this.totalLoading=true
getNmgTotal(this.queryParams).then(res=>{ getNmgTotal(this.queryParams).then(res=>{
this.totalData=res.data this.totalData=res.data
console.log(this.totalData,'totalData')
this.totalLoading=false this.totalLoading=false
}) })
}, },

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

@ -43,7 +43,7 @@ module.exports = {
// target: "http://127.0.0.1:18082", // target: "http://127.0.0.1:18082",
// target: "http://192.168.2.108:18080", // target: "http://192.168.2.108:18080",
// target: "http://192.168.2.103:18082", // target: "http://192.168.2.103:18082",
target: "http://localhost:18082", target: "http://192.168.31.26:18082",
// target: "http://192.168.2.108:18080", // target: "http://192.168.2.108:18080",
// target: "http://192.168.1.20:8084", // target: "http://192.168.1.20:8084",
changeOrigin: true, changeOrigin: true,

2
jwtech-pc-page/config/index.js

@ -33,7 +33,7 @@ module.exports = {
proxyTable: { proxyTable: {
'/jgThinking/thinking': { '/jgThinking/thinking': {
// target: 'http://127.0.0.1:18080/kms-pc-web', // target: 'http://127.0.0.1:18080/kms-pc-web',
target: 'http://localhost:18080', target: 'http://19.25.74.73:8096',
// target: 'http://192.168.2.100:18082/tianhui-admin-web', // target: 'http://192.168.2.100:18082/tianhui-admin-web',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {

8
jwtech-pc-page/src/api/enterpriseInformation.js

@ -139,3 +139,11 @@ export function getInfoTotal(){
method: 'get' method: 'get'
}) })
} }
export function getZhxxById(id){
return request({
url: '/enterprise/zhxx/'+id,
method: 'get'
})
}

29
jwtech-pc-page/src/views/announcement/index.vue

@ -3,9 +3,9 @@
<div class="certification-tabs"> <div class="certification-tabs">
<div class="tabs-wrap"> <div class="tabs-wrap">
<el-tabs ref="tabcs" v-model="activeName" @tab-click="handleClick"> <el-tabs ref="tabcs" v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="企业良好行为公告" name="good"></el-tab-pane> <el-tab-pane label="企业动态信用良好行为" name="good"></el-tab-pane>
<el-tab-pane label="企业不良行为公告" name="bad"></el-tab-pane> <el-tab-pane label="企业动态信用不良行为" name="bad"></el-tab-pane>
<el-tab-pane label="企业信用统计" name="xinyong"></el-tab-pane> <el-tab-pane label="动态信用排名" name="xinyong"></el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
@ -48,7 +48,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所在区域" v-if="activeName === 'xinyong'"> <el-form-item label="所在区域">
<el-select <el-select
v-model="queryForm.adcd" v-model="queryForm.adcd"
clearable clearable
@ -212,8 +212,8 @@ export default {
this.activeName = this.$route.query.type; this.activeName = this.$route.query.type;
} }
if (this.$route.query.enterpriseName3) { if (this.$route.query.enterpriseName3) {
this.activeName = "bad" this.activeName = "bad";
this.queryForm.enterpriseName = this.$route.query.enterpriseName3 this.queryForm.enterpriseName = this.$route.query.enterpriseName3;
} }
}, },
mounted() { mounted() {
@ -341,22 +341,23 @@ export default {
this.getResult(); this.getResult();
}, },
toDetail(row) { toDetail(row) {
console.log(111,row) console.log(111, row);
if (this.activeName!='xinyong'){ if (this.activeName != "xinyong") {
this.$router.push({ this.$router.push({
path: "/enterpriseInDetail", path: "/enterpriseInDetail",
query: { query: {
type: this.activeName, type: this.activeName,
enterpriseId: row.enterpriseId enterpriseId: row.enterpriseId
} }
})}else { });
} else {
this.$router.push({ this.$router.push({
path: "/enterpriseInDetail", path: "/enterpriseInDetail",
query: { query: {
type: this.activeName, type: this.activeName,
enterpriseId: row.id enterpriseId: row.id
} }
}) });
} }
} }
} }
@ -443,7 +444,7 @@ export default {
} }
.el-input__inner { .el-input__inner {
width: 259px; width: 220px;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
border-radius: 8px; border-radius: 8px;
@ -480,9 +481,9 @@ export default {
} }
.el-button:nth-child(2) { .el-button:nth-child(2) {
background: linear-gradient( 180deg, #FFFFFF 0%, #ECF6FF 100%); background: linear-gradient(180deg, #ffffff 0%, #ecf6ff 100%);
border: 1px solid #005EB7; border: 1px solid #005eb7;
color: #005EB7; color: #005eb7;
} }
} }

84
jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue

@ -24,10 +24,21 @@
<div class="table-wrap"> <div class="table-wrap">
<div class="table-title"> <div class="table-title">
<span> <span
:class="currentItem === '1' ? 'act' : ''"
@click="currentItem = '1'"
>
基本信息 基本信息
</span> </span>
<span
:class="currentItem === '2' ? 'act' : ''"
@click="currentItem = '2'"
>
信用承若
</span>
</div> </div>
<template v-if="currentItem === '1'">
<el-descriptions <el-descriptions
class="margin-top" class="margin-top"
:column="2" :column="2"
@ -52,16 +63,48 @@
{{ businessScope }} {{ businessScope }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</template>
<template v-else>
<el-descriptions
class="margin-top"
:column="2"
border
:content-style="rowCenter"
:label-style="labelRowCenter"
>
<el-descriptions-item label="企业承若书" span="2">
<div style="display: flex;flex-direction: column;">
<span
v-if="enterpriseObj.certificateInformation"
style="cursor: pointer;color: #0072ff;"
@click="
downloadEnterprisePromise(
enterpriseObj.certificateInformation
)
"
>下载承若书</span
><span style="color: #8b8b8b;" v-else>暂无文件</span>
<span
style="font-size: 14px;
color: #777777;"
>:企业承诺书模版已更新已使用原模板上传的仍然有效</span
>
</div>
</el-descriptions-item>
</el-descriptions>
</template>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { enterpriseInfo } from "@/api/enterpriseInformation"; import { enterpriseInfo } from "@/api/enterpriseInformation";
import { getGuangDong } from "@/api/creditStatistics"; import { getGuangDong } from "@/api/creditStatistics";
import { getFileStream } from "@/api/common";
export default { export default {
data() { data() {
return { return {
currentItem: "1",
rowCenter: { rowCenter: {
borderColor: "#DADCE3" borderColor: "#DADCE3"
}, },
@ -126,7 +169,7 @@ export default {
label: "单位性质", label: "单位性质",
code: "investmentComposition", code: "investmentComposition",
val: "" val: ""
}, }
// { // {
// label: "", // label: "",
// code: "enterpriseType", // code: "enterpriseType",
@ -149,6 +192,23 @@ export default {
this.getArea(); this.getArea();
}, },
methods: { methods: {
downloadEnterprisePromise(file) {
console.log(file);
getFileStream({ fileName: file.fileName }).then(res => {
const blob = new Blob([res], {
// type
// application/xlsx application/zip
type: "application/xlsx"
}); //excel,pdf
const href = URL.createObjectURL(blob); //URLblob
const a = document.createElement("a"); //a
a.style.display = "none";
a.href = href; //
a.download = file.name; //
a.click(); //
URL.revokeObjectURL(a.href); //URL
});
},
typeFormat(row, column) { typeFormat(row, column) {
return this.selectDictLabel(this.categoryList, row); return this.selectDictLabel(this.categoryList, row);
}, },
@ -300,13 +360,6 @@ export default {
line-height: 47px; line-height: 47px;
background-color: #f6f6f6; background-color: #f6f6f6;
span {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 16px;
color: #333333;
font-style: normal;
&::before { &::before {
content: ""; content: "";
display: inline-block; display: inline-block;
@ -316,6 +369,19 @@ export default {
margin-right: 10px; margin-right: 10px;
vertical-align: middle; vertical-align: middle;
} }
span {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 16px;
color: #333333;
font-style: normal;
margin-right: 10px;
cursor: pointer;
&.act {
color: #005eb7;
}
} }
} }
} }

4
jwtech-pc-page/src/views/home/components/noticeAnnouncement.vue

@ -38,7 +38,9 @@ export default {
type: "like", type: "like",
value: "" value: ""
}, },
data: {}, data: {
textType:0
},
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}, },

3
jwtech-pc-page/src/views/home/components/statisticsRight.vue

@ -83,7 +83,7 @@ export default {
}); });
console.log(convertedData,2222) console.log(convertedData,2222)
// ** China.json** // ** China.json**
const guangdongJson = await fetch("/static/map/guangdong.json").then(res => res.json()) const guangdongJson = await fetch("./static/map/guangdong.json").then(res => res.json())
console.log("1111111111111111111111") console.log("1111111111111111111111")
console.log(guangdongJson) console.log(guangdongJson)
echarts.registerMap("guangdong", guangdongJson); echarts.registerMap("guangdong", guangdongJson);
@ -211,7 +211,6 @@ export default {
roam: true, roam: true,
label: { label: {
normal: { normal: {
show: WebTransportDatagramDuplexStream,
textStyle: { textStyle: {
color: '#fff' color: '#fff'
} }

9
jwtech-pc-page/src/views/home/components/userLogin.vue

@ -54,11 +54,11 @@
</div> </div>
<div class="c-item"> <div class="c-item">
<div class="c-item-top">{{info.goodCreditNum}}</div> <div class="c-item-top">{{info.goodCreditNum}}</div>
<div class="c-item-bottom">企业良好行为公告</div> <div class="c-item-bottom">良好行为公告</div>
</div> </div>
<div class="c-item"> <div class="c-item">
<div class="c-item-top">{{info.badCreditNum}}</div> <div class="c-item-top">{{info.badCreditNum}}</div>
<div class="c-item-bottom">企业不良行为公告</div> <div class="c-item-bottom">不良行为公告</div>
</div> </div>
</div> </div>
</div> </div>
@ -221,6 +221,11 @@ export default {
color: #333; color: #333;
} }
} }
.c-item-bottom{
font-size: 14px;
letter-spacing: 0.3px;
}
} }
} }
} }

44
jwtech-pc-page/src/views/home/index.vue

@ -22,10 +22,16 @@
@click="chooseTab('3')" @click="chooseTab('3')"
>项目业绩</span >项目业绩</span
> --> > -->
<span
:class="activeTab == '5' ? 'activeSpan' : ''"
@click="chooseTab('5')"
>
企业信用良好信息</span
>
<span <span
:class="activeTab == '4' ? 'activeSpan' : ''" :class="activeTab == '4' ? 'activeSpan' : ''"
@click="chooseTab('4')" @click="chooseTab('4')"
>企业不良信息</span >企业信用不良信息</span
> >
</div> </div>
<div class="search_input" v-if="activeTab == '0'"> <div class="search_input" v-if="activeTab == '0'">
@ -88,6 +94,21 @@
</template> </template>
</el-input> </el-input>
</div> </div>
<div class="search_input" v-else-if="activeTab == '5'">
<el-input
v-model="enterpriseName3"
placeholder="请输入要搜索的企业名称"
class="searchContent"
@keyup.enter.native="goSearch(5)"
>
<template slot="append">
<div class="searchBtn" @click="goSearch(5)">
<img src="@/assets/image/search.png" />
<span>搜索</span>
</div>
</template>
</el-input>
</div>
<div class="search_input" v-else> <div class="search_input" v-else>
<el-input <el-input
v-model="enterpriseName3" v-model="enterpriseName3"
@ -282,6 +303,14 @@ export default {
} else { } else {
this.$message.warning("请输入企业名称"); this.$message.warning("请输入企业名称");
} }
} else if (key == "5") {
if (this.enterpriseName3) {
this.$router.push(
"/announcement?enterpriseName1=" + this.enterpriseName3
);
} else {
this.$message.warning("请输入企业名称");
}
} }
}, },
chooseTab(key) { chooseTab(key) {
@ -315,7 +344,13 @@ export default {
// padding: 0 360px; // padding: 0 360px;
padding-bottom: 20px; padding-bottom: 20px;
// background: linear-gradient( 180deg, #005EB7 0%, #EDF7FF 100%); // background: linear-gradient( 180deg, #005EB7 0%, #EDF7FF 100%);
background: linear-gradient(to bottom, #005EB7 0%, #EDF7FF 100% 670px, #EDF7FF 670px, #EDF7FF 100%); background: linear-gradient(
to bottom,
#005eb7 0%,
#edf7ff 100% 670px,
#edf7ff 670px,
#edf7ff 100%
);
.tabAndSearch-wrap { .tabAndSearch-wrap {
padding: 20px 0 20px 0; padding: 20px 0 20px 0;
@ -325,6 +360,7 @@ export default {
display: flex; display: flex;
margin: 0 auto; margin: 0 auto;
& > span { & > span {
flex: 1;
display: inline-block; display: inline-block;
width: 232px; width: 232px;
height: 70px; height: 70px;
@ -333,7 +369,7 @@ export default {
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
// color: #1672e5; // color: #1672e5;
color: #005EB7; color: #005eb7;
text-align: center; text-align: center;
background: url("~@/assets/image/home/search-item.png"); background: url("~@/assets/image/home/search-item.png");
background-size: 100% 100%; background-size: 100% 100%;
@ -367,7 +403,7 @@ export default {
/deep/ .el-input-group__append { /deep/ .el-input-group__append {
width: 100px; width: 100px;
padding: 0 17px; padding: 0 17px;
background: #0059A5; background: #0059a5;
border: 1px solid #aad8fb; border: 1px solid #aad8fb;
border-left: none; border-left: none;
border-radius: 0px 8px 8px 0px; border-radius: 0px 8px 8px 0px;

28
jwtech-pc-page/src/views/policyDoc/components/docWrap.vue

@ -32,6 +32,10 @@ import { zhxxList } from "@/api/zhxx";
export default { export default {
name: "docWrap", name: "docWrap",
props: { props: {
isSearch: {
type: Boolean,
default: false
},
title: { title: {
type: String, type: String,
default: "政策文件" default: "政策文件"
@ -40,6 +44,10 @@ export default {
type: String, type: String,
default: "1" default: "1"
}, },
proTotal: {
type: Number,
default: 0
},
docData: { docData: {
type: Array, type: Array,
default: () => [] default: () => []
@ -47,7 +55,7 @@ export default {
}, },
data() { data() {
return { return {
total: 10, total: 0,
pageSizes: [10, 20, 30, 50], pageSizes: [10, 20, 30, 50],
docDataList: [], docDataList: [],
queryForm: { queryForm: {
@ -65,7 +73,12 @@ export default {
}; };
}, },
mounted() { mounted() {
if (!this.isSearch) {
this.getResult(); this.getResult();
} else {
this.docDataList = this.docData;
this.total = this.proTotal;
}
}, },
methods: { methods: {
getResult() { getResult() {
@ -76,12 +89,13 @@ export default {
}); });
}, },
toDetail(item) { toDetail(item) {
this.$router.push({ this.$router.push(
path: "/policyDocDetail", "/summarizedDetail?title=" +
query: { item.title +
id: item.id "&id=" +
} item.id +
}); "&fromDoc=1"
);
} }
} }
}; };

27
jwtech-pc-page/src/views/policyDoc/index.vue

@ -20,22 +20,30 @@
</el-form> </el-form>
</div> </div>
<div class="docs-wrap"> <div class="docs-wrap">
<template v-if="isSearch">
<doc-wrap
:title="搜索结果"
:isSearch="true"
:docData="tableData"
:proTotal="total"
style="margin-bottom: 20px;"
></doc-wrap>
</template>
<template v-else>
<doc-wrap <doc-wrap
v-for="(item, index) in zhxxType" v-for="(item, index) in zhxxType"
:key="item.title" :key="item.title"
:title="item.title" :title="item.title"
:type="item.value" :type="item.value"
:docData="[
{ id: 1, title: '标题1', content: '内容1', time: '2020-11-11' },
{ id: 2, title: '标题2', content: '内容2', time: '2020-11-12' }
]"
style="margin-bottom: 20px;" style="margin-bottom: 20px;"
></doc-wrap> ></doc-wrap>
</template>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import docWrap from "./components/docWrap.vue"; import docWrap from "./components/docWrap.vue";
import { zhxxList } from "@/api/zhxx";
export default { export default {
components: { components: {
docWrap docWrap
@ -59,6 +67,7 @@ export default {
pageSize: 10 pageSize: 10
}, },
tableData: [], tableData: [],
isSearch: false,
zhxxType: [ zhxxType: [
{ title: "政策法规", value: "1" }, { title: "政策法规", value: "1" },
{ title: "部门规章", value: "2" }, { title: "部门规章", value: "2" },
@ -68,7 +77,15 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
getResult() {
zhxxList(this.queryForm).then(res => {
this.isSearch = true;
this.tableData = res.data.records;
this.total = res.data.total;
});
},
resetForm() { resetForm() {
this.isSearch = false;
this.queryForm = { this.queryForm = {
cv: { cv: {
name: "title", name: "title",
@ -78,7 +95,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}; };
this.getResult(); // this.getResult();
} }
} }
}; };

21
jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue

@ -2,7 +2,14 @@
<div class="pdf-wrap"> <div class="pdf-wrap">
<div class="pdf-header"> <div class="pdf-header">
<div class="header-wrap"> <div class="header-wrap">
<el-breadcrumb separator-class="el-icon-arrow-right"> <el-breadcrumb separator-class="el-icon-arrow-right" v-if="fromDoc">
<el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/policyDoc' }"
>政策文件</el-breadcrumb-item
>
<el-breadcrumb-item>政策文件详情</el-breadcrumb-item>
</el-breadcrumb>
<el-breadcrumb separator-class="el-icon-arrow-right" v-else>
<el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/summarizedInformation' }" <el-breadcrumb-item :to="{ path: '/summarizedInformation' }"
>公示公告</el-breadcrumb-item >公示公告</el-breadcrumb-item
@ -41,7 +48,7 @@
</div> </div>
</template> </template>
<script> <script>
import { zhxxList } from "@/api/enterpriseInformation"; import { zhxxList,getZhxxById } from "@/api/enterpriseInformation";
import { getFileStream } from "@/api/common"; import { getFileStream } from "@/api/common";
export default { export default {
data() { data() {
@ -54,20 +61,20 @@ export default {
pageSize: 10 pageSize: 10
}, },
title: "", title: "",
info: {} info: {},
fromDoc: false
}; };
}, },
mounted() { mounted() {
this.title = this.$route.query.title; this.title = this.$route.query.title;
this.fromDoc = this.$route.query.fromDoc == '1'
this.getDetail(); this.getDetail();
}, },
methods: { methods: {
getDetail() { getDetail() {
this.queryForm.data.id = this.$route.query.id; this.queryForm.data.id = this.$route.query.id;
zhxxList(this.queryForm).then(res => { getZhxxById(this.$route.query.id).then(res => {
if (res.data.records[0]) { this.info = res.data.data;
this.info = res.data.records[0];
}
}); });
}, },
// , // ,

3
jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java

@ -101,7 +101,6 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
map.put("100+",0); map.put("100+",0);
LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>infoLw=new LambdaQueryWrapper<>(); LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>infoLw=new LambdaQueryWrapper<>();
infoLw.isNotNull(BsSgcYxjdEnterpriseInfo::getScore); infoLw.isNotNull(BsSgcYxjdEnterpriseInfo::getScore);
infoLw.last("LIMIT 20");
List<BsSgcYxjdEnterpriseInfo> infos = bsSgcYxjdEnterpriseInfoMapper.selectList(infoLw); List<BsSgcYxjdEnterpriseInfo> infos = bsSgcYxjdEnterpriseInfoMapper.selectList(infoLw);
for (BsSgcYxjdEnterpriseInfo enterpriseInfo:infos){ for (BsSgcYxjdEnterpriseInfo enterpriseInfo:infos){
Integer score = Integer.parseInt(enterpriseInfo.getScore()); Integer score = Integer.parseInt(enterpriseInfo.getScore());
@ -128,7 +127,6 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
Map<String,Long>map=new HashMap<>(); Map<String,Long>map=new HashMap<>();
LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>infoLw=new LambdaQueryWrapper<>(); LambdaQueryWrapper<BsSgcYxjdEnterpriseInfo>infoLw=new LambdaQueryWrapper<>();
infoLw.isNotNull(BsSgcYxjdEnterpriseInfo::getEnterpriseType); infoLw.isNotNull(BsSgcYxjdEnterpriseInfo::getEnterpriseType);
infoLw.last("LIMIT 20");
List<BsSgcYxjdEnterpriseInfo> infos = bsSgcYxjdEnterpriseInfoMapper.selectList(infoLw); List<BsSgcYxjdEnterpriseInfo> infos = bsSgcYxjdEnterpriseInfoMapper.selectList(infoLw);
if (CollectionUtil.isNotEmpty(infos)) { if (CollectionUtil.isNotEmpty(infos)) {
map = infos.stream() map = infos.stream()
@ -253,7 +251,6 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService<BsSgcYxjdEnterpr
} }
} }
List<HashMap<String, String>> mapList = new ArrayList<>();
for (BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo : list) { for (BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo : list) {
if (map.containsKey(bsSgcYxjdEnterpriseInfo.getAdcd())) if (map.containsKey(bsSgcYxjdEnterpriseInfo.getAdcd()))
{map.put(bsSgcYxjdEnterpriseInfo.getAdcd(), String.valueOf(Integer.parseInt(map.get(bsSgcYxjdEnterpriseInfo.getAdcd())) {map.put(bsSgcYxjdEnterpriseInfo.getAdcd(), String.valueOf(Integer.parseInt(map.get(bsSgcYxjdEnterpriseInfo.getAdcd()))

17
jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java

@ -136,7 +136,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
.mapToDouble(Double::parseDouble) .mapToDouble(Double::parseDouble)
.sum(); .sum();
if (conPay>0) { if (conPay>0) {
nmgListTotal.setConPay(nmgListTotal.getConPay()+conPay); String conFormater = String.format("%.2f", conPay);
nmgListTotal.setConPay(nmgListTotal.getConPay()+Double.parseDouble(conFormater));
} }
} }
LambdaQueryWrapper<BsSgcJsjdBuiRealName> rnLw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BsSgcJsjdBuiRealName> rnLw = new LambdaQueryWrapper<>();
@ -166,7 +168,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
.filter(s -> s != null && !s.isEmpty()) .filter(s -> s != null && !s.isEmpty())
.mapToDouble(Double::parseDouble) .mapToDouble(Double::parseDouble)
.sum(); .sum();
nmgListTotal.setUnPayTotal(nmgListTotal.getUnPayTotal()+unPay); String unPayFormater = String.format("%.2f", unPay);
nmgListTotal.setUnPayTotal(nmgListTotal.getUnPayTotal()+Double.parseDouble(unPayFormater));
} }
} }
@ -220,7 +224,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
.filter(s -> s != null && !s.isEmpty()) .filter(s -> s != null && !s.isEmpty())
.mapToDouble(Double::parseDouble) .mapToDouble(Double::parseDouble)
.sum(); .sum();
proInfo.setConPay(String.valueOf(conPay)); String conFormater = String.format("%.2f", conPay);
proInfo.setConPay(conFormater);
} }
List<BsSgcJsjdBuiComAcc> list1 = bsSgcJsjdBuiComAccService.list(Wrappers.lambdaQuery(BsSgcJsjdBuiComAcc.class) List<BsSgcJsjdBuiComAcc> list1 = bsSgcJsjdBuiComAccService.list(Wrappers.lambdaQuery(BsSgcJsjdBuiComAcc.class)
@ -269,7 +274,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
.sum(); .sum();
if (salaryCurrent>0){ if (salaryCurrent>0){
proInfo.setPayTotal(String.valueOf(salaryCurrent)); String salaryCurrentFormat = String.format("%.2f", salaryCurrent);
proInfo.setPayTotal(salaryCurrentFormat);
}else { }else {
proInfo.setPayTotal("--"); proInfo.setPayTotal("--");
} }
@ -280,7 +286,8 @@ public class BsSgcJsjdBuiNmgStatisticsService {
.mapToDouble(Double::parseDouble) .mapToDouble(Double::parseDouble)
.sum(); .sum();
if (unSalary>0){ if (unSalary>0){
proInfo.setUnPayTotal(String.valueOf(unSalary)); String unSalaryFormater = String.format("%.2f", unSalary);
proInfo.setUnPayTotal(unSalaryFormater);
proInfo.setIsUnPay("是"); proInfo.setIsUnPay("是");
}else { }else {
proInfo.setUnPayTotal("0"); proInfo.setUnPayTotal("0");

2
jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@ -46,7 +46,7 @@
<select id="getArea" resultMap="BsSgcYxjdEnterpriseInfo"> <select id="getArea" resultMap="BsSgcYxjdEnterpriseInfo">
SELECT SUBSTRING(adcd, 1, 4) adcd, COUNT(adcd) num SELECT SUBSTRING(adcd, 1, 4) adcd, COUNT(adcd) num
from bs_sgc_yxjd_enterprise_info from bs_sgc_yxjd_enterprise_info where adcd is not null
GROUP BY SUBSTRING(adcd, 1, 4) GROUP BY SUBSTRING(adcd, 1, 4)
</select> </select>

Loading…
Cancel
Save