Merge remote-tracking branch 'origin/master'

jwtech-admin-page/src/views/marketSupervision/InformationQuery/goodCredit/index.vue

@@ -154,6 +154,19 @@
         align="left"
         prop="remark"
         min-width="120"
+      >
+
+        <template slot-scope="scope">
+            <span v-if="scope.row.remark == '1'">是</span>
+            <span v-else-if="scope.row.remark == '0'">否</span>
+            <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="企业名称"
+        align="left"
+        prop="enterpriseName"
+        min-width="120"
       />
       <el-table-column
         label="申报管理区划"
@@ -655,10 +668,11 @@ import { getFileStream } from "@/api/system/upload";
 import { getAreasData } from "@/api/areas/index";
 import { regionData, codeToText, TextToCode } from "element-china-area-data";
 import Div from "../../../build/div/index.vue";
+import Template from "@/views/message/options/template/index.vue";
 
 export default {
   name: "goodCredit",
-  components: {Div},
+  components: {Template, Div},
   data() {
     return {
       areasOptionProps: {

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

@@ -24,8 +24,9 @@
         min-width="120"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.remark">是</span>
-          <span v-else>否</span>
+          <span v-if="scope.row.remark == '1'">是</span>
+          <span v-else-if="scope.row.remark == '0'">否</span>
+          <span v-else>-</span>
         </template>
       </el-table-column>
       <el-table-column

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

@@ -394,10 +394,10 @@ export default {
         { lab: "项目总数（个）", key: "projectTotal", val: 0 },
         { lab: "投资总金额（万元）", key: "total", val: 0 },
         { lab: "合同总金额（万元）", key: "conPay", val: 0 },
-        { lab: "农民工总数（个）", key: "worksTotal", val: 0 },
-        { lab: "农民工在场数（个）", key: "enterNum", val: 0 },
-        { lab: "农民工退场数（个）", key: "exitNum", val: 0 },
-        { lab: "发放工资总数（元）", key: "payTotal", val: 0 },
+        { lab: "农民工总数（人）", key: "worksTotal", val: 0 },
+        { lab: "农民工在场数（人）", key: "enterNum", val: 0 },
+        { lab: "农民工退场数（人）", key: "exitNum", val: 0 },
+        { lab: "累计发放工资总数（元）", key: "payTotal", val: 0 },
         { lab: "总拖欠工资（元）", key: "unPayTotal", val: 0 },
       ],
     };

jwtech-framework/src/main/java/com/jianwei/common/utils/FileUploadUtils.java

@@ -31,6 +31,9 @@ public class FileUploadUtils
      */
     public static final int DEFAULT_FILE_NAME_LENGTH = 100;
 
+    public static final String[] DEFAULT_ALLOWED_EXTENSION_LOCAL = new String[]{"bmp", "gif", "jpg", "jpeg", "png", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "rar", "zip", "gz", "bz2", "pdf"};
+
+
     /**
      * 默认上传的地址
      */
@@ -57,7 +60,7 @@ public class FileUploadUtils
     {
         try
         {
-            return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+            return upload(getDefaultBaseDir(), file, DEFAULT_ALLOWED_EXTENSION_LOCAL);
         }
         catch (Exception e)
         {
@@ -77,7 +80,7 @@ public class FileUploadUtils
     {
         try
         {
-            return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
+            return upload(baseDir, file, DEFAULT_ALLOWED_EXTENSION_LOCAL);
         }
         catch (Exception e)
         {

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

@@ -37,6 +37,6 @@ public class BsSgcJsjdBuiLaborManagementService extends BaseService<BsSgcJsjdBui
             bsSgcJsjdBuiLaborManagement.setIdNo(MaskUtil.maskIDCard(bsSgcJsjdBuiLaborManagement.getIdNo()));
         }
         page.setRecords(records);
-        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+        return page;
     }
 }

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

@@ -5,13 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.mybaitsplus.BeanToWrapper;
+import com.jianwei.common.utils.MaskUtil;
 import com.jianwei.common.utils.StringUtils;
 import com.kms.build.domain.BsSgcJsjdBuiAttendanceInformation;
+import com.kms.build.domain.BsSgcJsjdBuiRealName;
 import org.springframework.stereotype.Service;
 import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiSalaryPayableMapper;
 import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable;
 
+import java.util.List;
+
 /**
  * 农民工工资发放管理Service接口
  *
@@ -25,6 +29,16 @@ public class BsSgcJsjdBuiSalaryPayableService extends BaseService<BsSgcJsjdBuiSa
         if (StringUtils.isEmpty(sp.getData().getProCode())){
             wrapper.isNull("pro_code");
         }
-        return getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+        Page page = getBaseMapper().selectPage(new Page<>(sp.getPageNum(),sp.getPageSize()),wrapper );
+
+        List<BsSgcJsjdBuiSalaryPayable> records = page.getRecords();
+        for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiRealName:records){
+            bsSgcJsjdBuiRealName.setBankSerialNumber(MaskUtil.maskName(bsSgcJsjdBuiRealName.getName()));
+            bsSgcJsjdBuiRealName.setCardBank(MaskUtil.maskIDCard(bsSgcJsjdBuiRealName.getCardBank()));
+            bsSgcJsjdBuiRealName.setCardNo(MaskUtil.maskIDCard(bsSgcJsjdBuiRealName.getCardNo()));
+            bsSgcJsjdBuiRealName.setIdNo(MaskUtil.maskIDCard(bsSgcJsjdBuiRealName.getIdNo()));
+            bsSgcJsjdBuiRealName.setName(MaskUtil.maskName(bsSgcJsjdBuiRealName.getName()));
+        }
+        return page;
     }
 }