Merge branch 'master' of http://175.178.86.109:3000/Niko/shuili_manager

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

@@ -15,7 +15,7 @@
         <td><span class="label">开工日期：</span>{{ projectInfo.commencementDate }}</td>
         <td colspan="2">
           <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>
 
         </td>

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

@@ -413,7 +413,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="统计证信息" prop="certificateInformation">
+          <el-form-item label="信用承诺书" prop="certificateInformation">
             <el-upload
               class="upload-demo"
               action="thinking/common/upload"
@@ -753,6 +753,9 @@ export default {
         if (this.form.safetyProductionAttachment) {
           this.fileList2 = JSON.parse(this.form.safetyProductionAttachment);
         }
+        if (this.form.certificateInformation){
+          this.fileList5=JSON.parse(this.form.certificateInformation)
+        }
       });
     },
     // 取消按钮
@@ -847,6 +850,7 @@ export default {
         if (valid) {
           this.form.socialCreditCodeAttachment = JSON.stringify(this.fileList1);
           this.form.safetyProductionAttachment = JSON.stringify(this.fileList2);
+          this.form.certificateInformation=JSON.stringify(this.fileList5)
           if (this.form.id != null) {
             updateEnterpriseInfo(this.form).then((response) => {
               if (response.code === 200) {

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

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

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

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

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

@@ -51,6 +51,16 @@
             >
             </el-cascader>
           </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-select
               v-model="queryParams.data.isUnPay"
@@ -68,15 +78,6 @@
               />
             </el-select>
           </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-select
               v-model="queryParams.data.isMajorProject"
@@ -468,6 +469,7 @@ export default {
       this.totalLoading=true
       getNmgTotal(this.queryParams).then(res=>{
         this.totalData=res.data
+        console.log(this.totalData,'totalData')
         this.totalLoading=false
       })
     },

jwtech-pc-page/config/index.js

@@ -33,7 +33,7 @@ module.exports = {
     proxyTable: {
       '/jgThinking/thinking': {
         // 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',
         changeOrigin: true,
         pathRewrite: {

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

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

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

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

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

@@ -83,7 +83,7 @@ export default {
       });
       console.log(convertedData,2222)
       // **异步加载本地 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(guangdongJson)
       echarts.registerMap("guangdong", guangdongJson);
@@ -211,7 +211,6 @@ export default {
             roam: true,
             label: {
               normal: {
-                show: WebTransportDatagramDuplexStream,
                 textStyle: {
                   color: '#fff'
                 }

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

@@ -41,7 +41,7 @@
   </div>
 </template>
 <script>
-import { zhxxList } from "@/api/enterpriseInformation";
+import { zhxxList,getZhxxById } from "@/api/enterpriseInformation";
 import { getFileStream } from "@/api/common";
 export default {
   data() {
@@ -64,10 +64,8 @@ export default {
   methods: {
     getDetail() {
       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];
-        }
       });
     },
     // 查看信息中, 下载

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

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

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

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

@@ -46,7 +46,7 @@
 
     <select id="getArea" resultMap="BsSgcYxjdEnterpriseInfo">
         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)
     </select>