From 2cb45ae0ff4be7d0f62ba2c29cd9062aca6b273c Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Thu, 3 Apr 2025 19:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=9B=9E=E5=BD=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jwtech-admin-page/src/main.js                 | 28 +++++++++++++++
 .../options/generalView.vue                   |  2 +-
 .../options/basePage.vue                      | 24 ++++++-------
 .../options/components/newBadCredit.vue       | 22 +++++++++---
 .../options/components/newGoodCredit.vue      | 10 +++---
 .../goodConductAudit/index.vue                |  2 +-
 .../peasantWorkers/index.vue                  |  1 +
 .../src/views/announcement/index.vue          |  3 ++
 .../components/actionList.vue                 |  1 +
 .../descriptionsEnterpriseTable.vue           |  4 +--
 .../components/lineCredit.vue                 | 26 +++++++++-----
 .../components/personalTable.vue              | 17 ++++++----
 .../components/realTimeCredit.vue             | 34 +++++++++----------
 .../enterprise/domain/dto/DisclosureDto.java  |  2 ++
 .../mapper/BsSgcYxjdDynamicCreditMapper.java  |  4 ++-
 .../BsSgcYxjdDynamicCreditService.java        |  4 +--
 .../kms/statistics/domain/NmgListTotal.java   |  3 ++
 .../BsSgcJsjdBuiSalaryStatisticsService.java  | 10 +++---
 .../build/BsSgcjsjdBuiProInfoMapper.xml       |  4 ++-
 .../BsSgcYxjdDynamicCreditMapper.xml          |  3 +-
 20 files changed, 135 insertions(+), 69 deletions(-)

diff --git a/jwtech-admin-page/src/main.js b/jwtech-admin-page/src/main.js
index c4cd0882..cfe73449 100644
--- a/jwtech-admin-page/src/main.js
+++ b/jwtech-admin-page/src/main.js
@@ -97,6 +97,33 @@ Vue.prototype.$formatAdcd=function(row) {
       return codeToText[provinceCode];
     }
   }
+
+  if (row.declarationManagementZones) {
+    let provinceCode = row.declarationManagementZones.slice(0, 2);
+    let cityCode = row.declarationManagementZones.slice(2, 4);
+    let areaCode = row.declarationManagementZones.slice(4);
+    if (areaCode != "00"|| areaCode.length > 2) {
+      if (codeToText[provinceCode + cityCode + areaCode]){
+        return (
+          codeToText[provinceCode] +
+          "-" +
+          codeToText[provinceCode + cityCode] +
+          "-" +
+          codeToText[provinceCode + cityCode + areaCode]
+        )}
+      else {
+        return    codeToText[provinceCode] +
+          "-" +
+          codeToText[provinceCode + cityCode]
+      }
+    } else if (cityCode != "00") {
+      return (
+        codeToText[provinceCode] + "-" + codeToText[provinceCode + cityCode]
+      );
+    } else {
+      return codeToText[provinceCode];
+    }
+  }
 }
 
 
@@ -137,6 +164,7 @@ Vue.prototype.$ButtonClickDiff = function(index) {
     type: 'warning',
     dangerouslyUseHTMLString: true,
     callback: action => {
+      console.log(index,'2222222222')
       if (action === 'confirm') {
         const refName = `uploadTemplate${index}`;
         this.$refs[refName].$refs['upload-inner'].handleClick();
diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
index b2ee2bab..7f928349 100644
--- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
+++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/generalView.vue
@@ -72,7 +72,7 @@
       <el-descriptions-item label="农民工工资保证金（万元）">
         {{ projectInfo.wageDeposit }}
       </el-descriptions-item>
-      <el-descriptions-item label="累计发放工资总金额（万元）">
+      <el-descriptions-item label="累计发放工资总金额（元）">
         {{ projectInfo.totalSalary }}
       </el-descriptions-item>
       <el-descriptions-item label="工资专用账户余额（万元）">
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
index 0d17d1aa..a1a80bbb 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue
@@ -304,7 +304,7 @@
             label="统一社会信用代码证"
             prop="socialCreditCodeAttachment"
           >
-            <el-upload ref="uploadTemplate"
+            <el-upload ref="uploadTemplate1"
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
@@ -319,7 +319,7 @@
               "
               :file-list="fileList1"
             >
-              <el-button size="small" type="primary" plain @click="$ButtonClick()" @click.stop="beforeUploadFile">
+              <el-button size="small" type="primary" plain @click="$ButtonClickDiff(1)" @click.stop="beforeUploadFile">
                 <i class="el-icon-upload el-icon--right"></i>
                 点击上传
               </el-button>
@@ -334,7 +334,7 @@
             label="安全生产许可证附件"
             prop="safetyProductionAttachment"
           >
-            <el-upload ref="uploadTemplate"
+            <el-upload ref="uploadTemplate2"
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
@@ -349,7 +349,7 @@
               "
               :file-list="fileList2"
             >
-              <el-button size="small" type="primary" plain @click="$ButtonClick()" @click.stop="beforeUploadFile">
+              <el-button size="small" type="primary" plain @click="$ButtonClickDiff(2)" @click.stop="beforeUploadFile">
                 <i class="el-icon-upload el-icon--right"></i>
                 点击上传
               </el-button>
@@ -361,7 +361,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="银行开户许可证信息" prop="permitInformation">
-            <el-upload ref="uploadTemplate"
+            <el-upload ref="uploadTemplate3"
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
@@ -376,7 +376,7 @@
               "
               :file-list="fileList3"
             >
-              <el-button size="small" type="primary" plain @click="$ButtonClick()" @click.stop="beforeUploadFile">
+              <el-button size="small" type="primary" plain @click="$ButtonClickDiff(3)" @click.stop="beforeUploadFile">
                 <i class="el-icon-upload el-icon--right"></i>
                 点击上传
               </el-button>
@@ -388,7 +388,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="工商年检结果" prop="icResults">
-            <el-upload ref="uploadTemplate"
+            <el-upload ref="uploadTemplate4"
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
@@ -403,7 +403,7 @@
               "
               :file-list="fileList4"
             >
-              <el-button size="small" type="primary" plain @click="$ButtonClick()" @click.stop="beforeUploadFile">
+              <el-button size="small" type="primary" plain @click="$ButtonClickDiff(4)" @click.stop="beforeUploadFile">
                 <i class="el-icon-upload el-icon--right"></i>
                 点击上传
               </el-button>
@@ -419,7 +419,7 @@
             prop="certificateInformation"
             style="position: relative"
           >
-            <el-upload ref="uploadTemplate"
+            <el-upload ref="uploadTemplate5"
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
@@ -434,7 +434,7 @@
               "
               :file-list="fileList5"
             >
-              <el-button size="small" type="primary" plain @click="$ButtonClick()" @click.stop="beforeUploadFile">
+              <el-button size="small" type="primary" plain @click="$ButtonClickDiff(5)" @click.stop="beforeUploadFile">
                 <i class="el-icon-upload el-icon--right"></i>
                 点击上传
               </el-button>
@@ -460,7 +460,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="营业执照信息" prop="licenseInformation">
-            <el-upload ref="uploadTemplate"
+            <el-upload ref="uploadTemplate6"
               class="upload-demo"
               action="thinking/common/upload"
               :headers="headers"
@@ -475,7 +475,7 @@
               "
               :file-list="fileList6"
             >
-              <el-button size="small" type="primary" plain @click="$ButtonClick()" @click.stop="beforeUploadFile">
+              <el-button size="small" type="primary" plain @click="$ButtonClickDiff(6)" @click.stop="beforeUploadFile">
                 <i class="el-icon-upload el-icon--right"></i>
                 点击上传
               </el-button>
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue
index fc6f3299..5b66f2f0 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newBadCredit.vue
@@ -239,13 +239,18 @@
                   filterable
                   :filter-method="filterBehavior"
                   default-first-option
+
                 >
                   <el-option
                     v-for="dict in filteredBadCreditOptions"
                     :key="dict.id"
                     :label="dict.dictLabel"
                     :value="dict.dictLabel"
-                  ></el-option>
+                  >
+                     <span style="white-space: normal; word-break: break-all; line-height: 1.5;">
+        {{ dict.dictLabel }}
+      </span>
+                  </el-option>
                 </el-select>
               </el-form-item>
 
@@ -425,7 +430,7 @@
           :labelStyle="{
             'text-align': 'left',
             width: '180px',
-            height: '50px',
+            height: '60px',
           }"
           :contentStyle="{ minWidth: '350px' }"
         >
@@ -713,7 +718,6 @@ export default {
     });
     this.getDicts("bad_level").then((response) => {
       this.badLevelOptions = response.data;
-      this.filteredBadCreditOptions = this.badCreditOptions;
 
     });
     this.getDicts("demerit_value").then((response) => {
@@ -725,6 +729,8 @@ export default {
     });
     this.getDicts("bad_credit_behavior").then((response) => {
       this.badCreditOptions = response.data;
+      this.filteredBadCreditOptions = this.badCreditOptions;
+
     });
     listPerformanceRecord({ data: { enterpriseId: this.enterpriseId } }).then(
       (response) => {
@@ -740,8 +746,7 @@ export default {
           return item.dictLabel.toLowerCase().includes(query.toLowerCase());
         });
       } else {
-        this.behaviorKeyword = '';
-        this.filteredBadCreditOptions = this.badCreditOptions;
+        return  this.badCreditOptions
       }
     },
 
@@ -1147,6 +1152,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-select-dropdown__item {
+  white-space: normal !important;
+  word-break: break-all !important;
+  line-height: 1.5 !important;
+  padding: 8px 20px !important;
+  height: auto !important;
+}
 @import "@/assets/css/dialog.scss";
 //::v-deep {
 //   .el-dialog {
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
index 9239d668..8f99f150 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue
@@ -783,19 +783,19 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 申报管理区划</template>
-            {{ this.creditMsg.declarationManagementZones }}
+            {{ $formatAdcd(creditMsg)}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 良好行为</template>
-            {{ behaviorFormat(this.creditMsg) }}
+            {{ this.creditMsg.behavior }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 表彰等级</template>
-            {{ commendationLevelFormat(this.creditMsg) }}
+            {{ this.creditMsg.commendationLevel}}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 颁发机构</template>
-            {{ authorityFormat(this.creditMsg) }}
+            {{ this.creditMsg.authority }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 加分值</template>
@@ -1261,7 +1261,7 @@ export default {
       return this.selectDictLabel(this.behaviorOption, row.behavior);
     },
     isFormat(row, column) {
-      return this.selectDictLabel(this.isFormat, row);
+      return this.selectDictLabel(this.isOptions, row);
     },
     visibleChange(visible) {
       // console.log(visible);
diff --git a/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue b/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue
index 9eb6fc9d..5b57ee4a 100644
--- a/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue
@@ -714,7 +714,7 @@ export default {
           validityPeriod: null,
           awardAnnouncementWebsite: null,
           attachment: null,
-          status: "2",
+          status: "1",
           type: null,
           badBehavior: null,
           createUid: null,
diff --git a/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue b/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
index 101c9cec..8d6f3fe2 100644
--- a/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
+++ b/jwtech-admin-page/src/views/projectStatistics/peasantWorkers/index.vue
@@ -391,6 +391,7 @@ export default {
         checkStrictly: true, //选择任意一级
       },
       totalDataType: [
+        { lab: "项目总数（个）", key: "projectTotal", val: 0 },
         { lab: "投资总金额（万元）", key: "total", val: 0 },
         { lab: "合同总金额（万元）", key: "conPay", val: 0 },
         { lab: "农民工总数（个）", key: "worksTotal", val: 0 },
diff --git a/jwtech-pc-page/src/views/announcement/index.vue b/jwtech-pc-page/src/views/announcement/index.vue
index 61b868de..74aceab6 100644
--- a/jwtech-pc-page/src/views/announcement/index.vue
+++ b/jwtech-pc-page/src/views/announcement/index.vue
@@ -194,6 +194,7 @@ export default {
       queryForm: {
         enterpriseName: "",
         qualificationCategory: "all",
+        status:null,
         pageNum: 1,
         pageSize: 10,
         adcd: ""
@@ -263,6 +264,7 @@ export default {
     },
     getResult() {
       this.loading = true;
+      this.queryForm.status=3
       let queryForm = JSON.parse(JSON.stringify(this.queryForm));
       if (queryForm.qualificationCategory == "all") {
         queryForm.qualificationCategory = "";
@@ -270,6 +272,7 @@ export default {
 
       switch (this.activeName) {
         case "good":
+
           creditGetGood(queryForm).then(res => {
             this.tableData = res.data.records;
             this.total = res.data.total;
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue
index 71680fad..1a49d1c5 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue
@@ -120,6 +120,7 @@ export default {
       if (this.title == "良好行为列表") {
         // this.$emit("getGoodResult");
         this.enterpriseForm.data.type = "1";
+        this.enterpriseForm.data.status="3"
         creditList(this.enterpriseForm).then(res => {
           this.tableList = res.data.records;
           console.log("this.goodList", res);
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
index 1c8906a6..134ca388 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue
@@ -82,7 +82,7 @@
           :content-style="rowCenter"
           :label-style="labelRowCenter"
         >
-          <el-descriptions-item label="企业承若书" span="2">
+          <el-descriptions-item label="企业承诺书" span="2">
             <div style="display: flex;flex-direction: column;">
               <span
                 v-if="enterpriseObj.certificateInformation"
@@ -92,7 +92,7 @@
                     enterpriseObj.certificateInformation
                   )
                 "
-                >下载承若书</span
+                >下载承诺书</span
               ><span style="color: #8b8b8b;" v-else>暂无文件</span>
               <span
                 style="font-size: 14px;
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/lineCredit.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/lineCredit.vue
index e375e93a..354a726f 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/lineCredit.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/lineCredit.vue
@@ -21,6 +21,16 @@ export default {
       interval:0
     };
   },
+  watch:{
+      month(newVal, oldVal){
+        if (newVal === 1) {
+          this.scoreAMount();
+        }
+        if (newVal === 3 || newVal === 6) {
+          this.scoreThreeMount();
+        }
+      }
+  },
   created() {
     if (this.month==1) {
       this.scoreAMount()
@@ -41,19 +51,21 @@ export default {
         console.log(4444, Object.keys(res.data.data))
         this.dates=Object.keys(res.data.data)
         this.values=Object.values(res.data.data)
+        this.initEcharts()
       })
     },
     scoreThreeMount(){
       getScoreThreeMount({enterpriseId:this.enterpriseId,qualificationCategory:this.qualificationCategory,month:this.month}).then(res=>{
         this.dates=Object.keys(res.data.data)
         this.values=Object.values(res.data.data)
+        this.initEcharts()
       })
     },
     getEnterpriseInfo(){
       enterpriseInfo(this.enterpriseId).then(res=>{
         this.enterpriseInfo=res.data.data
         console.log(111,this.enterpriseInfo)
-        this.initEcharts()
+
       })
     },
     initEcharts() {
@@ -64,6 +76,9 @@ export default {
       if (this.month==3||this.month==6){
         this.interval=0
       }
+
+      const maxValue = Math.max(...this.values);
+      const yAxisMax = maxValue * 1.2; // 最大值乘以1.2，留出20%的空间
       const option = {
         // title: {
         //   text: this.enterpriseInfo.enterpriseName
@@ -107,14 +122,7 @@ export default {
         },
         yAxis: {
           type: "value",
-          max:100
-          // axisLabel: {
-          //     interval: 0,
-          //     textStyle: {
-          //         color: 'rgba(255, 255, 255, 1)',
-          //         fontSize: '12',
-          //     },
-          // },
+          max:yAxisMax
         },
         lineStyle: {
           color: "red"
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/personalTable.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/personalTable.vue
index 75dabe2d..338b43c7 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/personalTable.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/personalTable.vue
@@ -10,11 +10,12 @@
           v-for="(item, index) in allPersonType"
           :key="(item, index)"
           :label="item.personTypeLabel"
+          v-if="item.personTypeData[0]"
         >
-          <div v-if="item.personTypeLabel === '法定代表人'">
+          <div v-if="item.personTypeValue == 3&&item.personTypeData[0]">
             {{ item.personTypeData[0].name }}
           </div>
-          <div v-else>
+          <div v-else-if="item.personTypeData[0]">
             <el-table :data="item.personTypeData" border style="width: 100%">
               <el-table-column prop="name" label="姓名" width="110">
               </el-table-column>
@@ -79,8 +80,6 @@ export default {
     this.getDicts("certificate_level").then(res => {
       this.certificateLevelOptions = res.data.data;
     });
-  },
-  mounted() {
     this.getDicts("personnel_type").then(res => {
       this.allPersonType = [];
       this.personList = res.data.data;
@@ -93,7 +92,11 @@ export default {
         };
         this.allPersonType.push(obj);
       });
+
     });
+  },
+  mounted() {
+
     this.enterpriseId = this.$route.query.enterpriseId;
     this.getPersonInfo();
   },
@@ -135,9 +138,9 @@ export default {
               item2.personTypeData.push(item);
             }
           });
-          if (item.personType !== "0" && item.personType !== "1") {
-            this.allPersonType[2].personTypeData.push(item);
-          }
+          // if (item.personType !== "0" && item.personType !== "1") {
+          //   this.allPersonType[2].personTypeData.push(item);
+          // }
         });
 
         this.allPersonType.sort((a, b) => {
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/realTimeCredit.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/realTimeCredit.vue
index ee09e737..3da1e02f 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/realTimeCredit.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/realTimeCredit.vue
@@ -49,22 +49,22 @@ font-style: normal;"
       ></span>
     </div>
     <div class="tabs-line">
-      <div class="tabs-wrap">
-        <el-tabs type="border-card" @tab-click="handleTabClick">
-          <el-tab-pane label="近一个月"></el-tab-pane>
-          <el-tab-pane label="近三个月"></el-tab-pane>
-          <el-tab-pane label="近六个月"></el-tab-pane>
-        </el-tabs>
-      </div>
-      <div class="line-wrap">
-        <lineCredit
-          v-if="qualificationCategory && month"
-          :key="month"
-          :enterpriseId="this.queryForm.enterpriseId"
-          :qualificationCategory="this.qualificationCategory"
-          :month="this.month"
-        />
-      </div>
+<!--      <div class="tabs-wrap">-->
+<!--        <el-tabs type="border-card" @tab-click="handleTabClick">-->
+<!--          <el-tab-pane label="近一个月"></el-tab-pane>-->
+<!--          <el-tab-pane label="近三个月"></el-tab-pane>-->
+<!--          <el-tab-pane label="近六个月"></el-tab-pane>-->
+<!--        </el-tabs>-->
+<!--      </div>-->
+<!--      <div class="line-wrap">-->
+<!--        <lineCredit-->
+<!--          v-if="qualificationCategory && month"-->
+<!--          :key="month"-->
+<!--          :enterpriseId="this.queryForm.enterpriseId"-->
+<!--          :qualificationCategory="this.qualificationCategory"-->
+<!--          :month="this.month"-->
+<!--        />-->
+<!--      </div>-->
     </div>
   </div>
 </template>
@@ -192,7 +192,7 @@ export default {
 .credit-wrap {
   position: relative;
   // margin: 20px;
-  height: 550px;
+  height: 150px;
   // border: 1px solid #cfe7fe;
 
   /deep/.el-form {
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java
index 67d80366..dc8c5651 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/DisclosureDto.java
@@ -17,6 +17,8 @@ public class DisclosureDto implements Serializable {
 
     private String enterpriseName;
 
+    private String status;
+
     private String adcd;
 
     private String enterpriseId;
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java
index 8939482e..26329049 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdDynamicCreditMapper.java
@@ -31,7 +31,9 @@ public interface BsSgcYxjdDynamicCreditMapper extends BaseMapper<BsSgcYxjdDynami
     List<BadHaviorDto> getBadAll(@Param("enterpriseId")String enterpriseId,
                                  @Param("type") String type);
 
-    IPage<BadHaviorDto> getGood(@Param("adcd")String adcd,
+    IPage<BadHaviorDto> getGood(
+                                @Param("status")String status,
+                               @Param("adcd")String adcd,
                                @Param("enterpriseName") String enterpriseName,
                                @Param("qualificationCategory")String qualificationCategory,
                                 IPage page);
diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java
index 22be7a31..d48aff91 100644
--- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java
+++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java
@@ -87,7 +87,7 @@ public class BsSgcYxjdDynamicCreditService extends BaseService<BsSgcYxjdDynamicC
         for (BsSgcYxjdDynamicCredit credit : bsSgcYxjdDynamicCredits) {
             LocalDate date = convertToLocalDate(credit.getCreateTime());
             if (!date.isBefore(oneMonthAgo)&&!date.isAfter(today)) {
-                if (credit.getType().equals("0")) {
+                if (credit.getType().equals("1")) {
                     defaultScore+=Integer.valueOf(credit.getBonusPoints());
                     dailyScores.put(date, defaultScore);
                 }else {
@@ -207,7 +207,7 @@ public class BsSgcYxjdDynamicCreditService extends BaseService<BsSgcYxjdDynamicC
     }
 
     public IPage getGood(DisclosureDto dto) {
-        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getGood(xzqhService.getSubString(dto.getAdcd()), dto.getEnterpriseName(),
+        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getGood(dto.getStatus(),xzqhService.getSubString(dto.getAdcd()), dto.getEnterpriseName(),
                 dto.getQualificationCategory(), new Page<>(dto.getPageNum(), dto.getPageSize()));
 
 
diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/NmgListTotal.java b/jwtech-system/src/main/java/com/kms/statistics/domain/NmgListTotal.java
index 8325ed63..09e8ed16 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/domain/NmgListTotal.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/domain/NmgListTotal.java
@@ -5,6 +5,8 @@ import lombok.Data;
 
 @Data
 public class NmgListTotal {
+
+    private Integer projectTotal;
     private double total;
     private double conPay;
     private double worksTotal;
@@ -14,6 +16,7 @@ public class NmgListTotal {
     private double unPayTotal;
 
     public NmgListTotal() {
+        this.projectTotal=0;
         this.total=0;
         this.conPay=0;
         this.enterNum=0;
diff --git a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java
index 75441ba2..69134363 100644
--- a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java
+++ b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java
@@ -60,7 +60,7 @@ public class BsSgcJsjdBuiSalaryStatisticsService extends BaseService<BsSgcJsjdBu
             bsSgcJsjdBuiSalaryStatistics1.setCumulativeArrears("0");
             bsSgcJsjdBuiSalaryStatistics.add(bsSgcJsjdBuiSalaryStatistics1);
         });
-        Integer num=0;
+        Double num=0.0;
         if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryStatistics)){
         for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiSalaryPayable:bsSgcJsjdBuiSalaryPayables){
             String date= DateUtil.format(bsSgcJsjdBuiSalaryPayable.getSalaryTime(),"yyyy-MM");
@@ -68,14 +68,14 @@ public class BsSgcJsjdBuiSalaryStatisticsService extends BaseService<BsSgcJsjdBu
                 if (ObjectUtil.isNotEmpty(date)&&StringUtils.isNotEmpty(item.getStatisticsDate())){
                     if (item.getStatisticsDate().equals(date)){
                         if (ObjectUtil.isNotEmpty(item.getCurrentPayable())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())) {
-                            item.setCurrentPayable(String.valueOf(Integer.parseInt(item.getCurrentPayable()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())));
+                            item.setCurrentPayable(String.valueOf(Double.parseDouble(item.getCurrentPayable()) + Double.parseDouble(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryPayable())));
                         }
                         if (ObjectUtil.isNotEmpty(item.getCurrentNetPay())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryCurrent())){
-                            item.setCurrentNetPay(String.valueOf(Integer.parseInt(item.getCurrentNetPay()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryCurrent())));
+                            item.setCurrentNetPay(String.valueOf(Double.parseDouble(item.getCurrentNetPay()) + Double.parseDouble(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryCurrent())));
                         }
                         if (ObjectUtil.isNotEmpty(item.getCurrentArrears())&&ObjectUtil.isNotEmpty(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct())) {
-                            item.setCurrentArrears(String.valueOf(Integer.parseInt(item.getCurrentArrears()) + Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct())));
-                            num+=Integer.parseInt(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct());
+                            item.setCurrentArrears(String.valueOf(Double.parseDouble(item.getCurrentArrears()) + Double.parseDouble(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct())));
+                            num+=Double.parseDouble(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct());
                         }
                     }
                 }
diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
index 0fbec46c..0968a15d 100644
--- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
@@ -189,6 +189,7 @@
 
     <resultMap id="NmgListTotal" type="NmgListTotal">
         <result property="total" column="total"/>
+        <result property="projectTotal" column="projectTotal"/>
         <result property="conPay" column="conPay"/>
         <result property="worksTotal" column="workTotal"/>
         <result property="enterNum" column="enterTotal"/>
@@ -616,6 +617,7 @@
 
     <select id="selectManagePageNmg" resultMap="NmgListTotal">
         SELECT
+        total_query.projectTotal AS projectTotal,
         total_query.total AS total,
         pay_query.payTotal AS payTotal,
         pay_query.unPayTotal AS unPayTotal,
@@ -624,7 +626,7 @@
         worker_query.exitTotal AS exitTotal,
         worker_query.enterTotal AS enterTotal
         FROM
-        (SELECT ROUND(IFNULL(SUM(pi.TOTAL), 0), 2) AS total
+        (SELECT COUNT(pi.id) AS projectTotal,ROUND(IFNULL(SUM(pi.TOTAL), 0), 2) AS total
         FROM bs_sgc_jsjd_bui_pro_info pi
         WHERE 1=1
         <if test="projectName!=null and projectName!=''">
diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml
index 0eaaae64..e1486ab8 100644
--- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml
@@ -133,7 +133,8 @@
             <if test="qualificationCategory!=null and qualificationCategory!=''">
                 and dc.qualification_category=#{qualificationCategory}
             </if>
-            and dc.type=1 and dc.status =5
+
+            and dc.type=1 and dc.status =3
         </where>
         order by dc.create_time desc
     </select>