Skip to content

Z
zhichan
Commit e9f83ff4 by 王昆
Options

gsb

parent a00bf12b
Showing with 205 additions and 114 deletions
laowubao/app/base/api/impl/operator/laoActionApi.js
...@@ -28,6 +28,7 @@ class LaoActionApi extends APIBase { ...@@ -28,6 +28,7 @@ class LaoActionApi extends APIBase {
this.transactioninfoSve = system.getObject("service.operator.transactioninfoSve"); this.transactioninfoSve = system.getObject("service.operator.transactioninfoSve");
this.msSve = system.getObject("service.common.msSve"); this.msSve = system.getObject("service.common.msSve");
this.userconfSve = system.getObject("service.operator.userconfSve");
this.applyStatusMap = { this.applyStatusMap = {
10: "已申请", 10: "已申请",
...@@ -38,52 +39,52 @@ class LaoActionApi extends APIBase { ...@@ -38,52 +39,52 @@ class LaoActionApi extends APIBase {
60: "签约成功", 60: "签约成功",
} }
this.companyConfig = { // this.companyConfig = {
yd: { // yd: {
signCompanyIds: [10173, 492], // signCompanyIds: [10173, 492],
payCompanyIds: ['1152185172836229121', '1152186076306087937', '1165922409285480450', '1169516233595670529', '1174219506669584386', '1197064800073707522', '1199605424102690818'], // payCompanyIds: ['1152185172836229121', '1152186076306087937', '1165922409285480450', '1169516233595670529', '1174219506669584386', '1197064800073707522', '1199605424102690818'],
companyInfo: { // companyInfo: {
companyName: "上海韵达货运有限公司", // companyName: "上海韵达货运有限公司",
taxType: "一般纳税人", // taxType: "一般纳税人",
contactName: "陈梁", // contactName: "陈梁",
contactEmail: "chenliang8725@yundasys.com", // contactEmail: "chenliang8725@yundasys.com",
contactAddr: "上海市青浦区赵巷镇盈港东路6679号", // contactAddr: "上海市青浦区赵巷镇盈港东路6679号",
bankAccount: "上海韵达货运有限公司", // bankAccount: "上海韵达货运有限公司",
openBank: "邮政储蓄银行青浦支行", // openBank: "邮政储蓄银行青浦支行",
bankno: "100360752790012735", // bankno: "100360752790012735",
sign_body: "舟山兰和科技有限公司", // sign_body: "舟山兰和科技有限公司",
signBeginTime: "2019-08-26", // signBeginTime: "2019-08-26",
signEndTime: "2020-08-26", // signEndTime: "2020-08-26",
contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_247111576475725735201916135525735contract_yd.pdf", // contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_247111576475725735201916135525735contract_yd.pdf",
business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_2671115777007820212019301813221yd_b.jpg", // business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_2671115777007820212019301813221yd_b.jpg",
} // }
}, // },
tfb: { // tfb: {
signCompanyIds: [11410, 492], // signCompanyIds: [11410, 492],
payCompanyIds: ['1187270470698082306', '1187272600083308546', '1187274198010056705', '1202100969987661826'], // payCompanyIds: ['1187270470698082306', '1187272600083308546', '1187274198010056705', '1202100969987661826'],
companyInfo: { // companyInfo: {
companyName: "杭州淘粉吧网络技术股份有限公司", // companyName: "杭州淘粉吧网络技术股份有限公司",
taxType: "一般纳税人", // taxType: "一般纳税人",
contactName: "王萍", // contactName: "王萍",
contactEmail: "wangping@taofen8.com", // contactEmail: "wangping@taofen8.com",
contactAddr: "浙江省杭州市西湖区西斗门路9号福地创业园1号楼2楼", // contactAddr: "浙江省杭州市西湖区西斗门路9号福地创业园1号楼2楼",
bankAccount: "杭州淘粉吧网络技术股份有限公司", // bankAccount: "杭州淘粉吧网络技术股份有限公司",
openBank: "杭州银行学院路支行", // openBank: "杭州银行学院路支行",
bankno: "3301040160000822687", // bankno: "3301040160000822687",
sign_body: "舟山兰和科技有限公司", // sign_body: "舟山兰和科技有限公司",
signBeginTime: "2019-10-24", // signBeginTime: "2019-10-24",
signEndTime: "2020-10-24", // signEndTime: "2020-10-24",
contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_59111576475747388201916135547388contract_tfb.pdf", // contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_59111576475747388201916135547388contract_tfb.pdf",
business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_142111576475271657201916134751657bl_tfb.jpg", // business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_142111576475271657201916134751657bl_tfb.jpg",
} // }
} // }
} // }
this.userConfig = { // this.userConfig = {
26: this.companyConfig.yd, // 26: this.companyConfig.yd,
29: this.companyConfig.yd, // 29: this.companyConfig.yd,
30: this.companyConfig.tfb // 30: this.companyConfig.tfb
} // }
} }
async testAES(pobj) { async testAES(pobj) {
...@@ -1439,10 +1440,17 @@ class LaoActionApi extends APIBase { ...@@ -1439,10 +1440,17 @@ class LaoActionApi extends APIBase {
// 企业信息，家属拒 // 企业信息，家属拒
async companyInfo(qobj) { async companyInfo(qobj) {
try { try {
let config = this.userConfig[qobj.userId]; let config = await this.userconfSve.findById(qobj.userId);
// let config = this.userConfig[qobj.userId];
if (!config) { if (!config) {
return system.getResultSuccess({}); return system.getResultSuccess({});
} }
let companyInfo;
try {
companyInfo = JSON.parse(config.companyInfo || "{}");
} catch (e) {
companyInfo = {};
}
return system.getResultSuccess(config.companyInfo); return system.getResultSuccess(config.companyInfo);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
......
laowubao/app/base/api/impl/operator/xbgApi.js
...@@ -13,62 +13,68 @@ class XbgApi extends apiBase { ...@@ -13,62 +13,68 @@ class XbgApi extends apiBase {
this.recruitSve = system.getObject("service.operator.recruitSve"); this.recruitSve = system.getObject("service.operator.recruitSve");
this.userlabourSve = system.getObject("service.operator.userlabourSve"); this.userlabourSve = system.getObject("service.operator.userlabourSve");
this.usersSve = system.getObject("service.operator.usersSve"); this.usersSve = system.getObject("service.operator.usersSve");
this.companyConfig = { this.userconfSve = system.getObject("service.operator.userconfSve");
yd: {
signCompanyIds: [10173, 492], // this.companyConfig = {
payCompanyIds: ['1152185172836229121', '1152186076306087937', '1165922409285480450', '1169516233595670529', '1174219506669584386', '1197064800073707522', '1199605424102690818'], // yd: {
companyInfo: { // signCompanyIds: [10173, 492],
companyName: "上海韵达货运有限公司", // payCompanyIds: ['1152185172836229121', '1152186076306087937', '1165922409285480450', '1169516233595670529', '1174219506669584386', '1197064800073707522', '1199605424102690818'],
taxType: "一般纳税人", // companyInfo: {
contactName: "陈梁", // companyName: "上海韵达货运有限公司",
contactEmail: "chenliang8725@yundasys.com", // taxType: "一般纳税人",
contactAddr: "上海市青浦区赵巷镇盈港东路6679号", // contactName: "陈梁",
bankAccount: "上海韵达货运有限公司", // contactEmail: "chenliang8725@yundasys.com",
openBank: "邮政储蓄银行青浦支行", // contactAddr: "上海市青浦区赵巷镇盈港东路6679号",
bankno: "100360752790012735", // bankAccount: "上海韵达货运有限公司",
sign_body: "舟山兰和科技有限公司", // openBank: "邮政储蓄银行青浦支行",
signBeginTime: "2019-08-26", // bankno: "100360752790012735",
signEndTime: "2020-08-26", // sign_body: "舟山兰和科技有限公司",
contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_247111576475725735201916135525735contract_yd.pdf", // signBeginTime: "2019-08-26",
business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_2671115777007820212019301813221yd_b.jpg", // signEndTime: "2020-08-26",
}, // contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_247111576475725735201916135525735contract_yd.pdf",
dataView: { // business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_2671115777007820212019301813221yd_b.jpg",
actual_amt: "157073.09", // },
contractCount: 11804, // dataView: {
income_tax: "0", // actual_amt: "157073.09",
}, // contractCount: 11804,
}, // income_tax: "0",
tfb: { // },
signCompanyIds: [11410, 492], // },
payCompanyIds: ['1187270470698082306', '1187272600083308546', '1187274198010056705', '1202100969987661826'], // tfb: {
companyInfo: { // signCompanyIds: [11410, 492],
companyName: "杭州淘粉吧网络技术股份有限公司", // payCompanyIds: ['1187270470698082306', '1187272600083308546', '1187274198010056705', '1202100969987661826'],
taxType: "一般纳税人", // companyInfo: {
contactName: "王萍", // companyName: "杭州淘粉吧网络技术股份有限公司",
contactEmail: "wangping@taofen8.com", // taxType: "一般纳税人",
contactAddr: "浙江省杭州市西湖区西斗门路9号福地创业园1号楼2楼", // contactName: "王萍",
bankAccount: "杭州淘粉吧网络技术股份有限公司", // contactEmail: "wangping@taofen8.com",
openBank: "杭州银行学院路支行", // contactAddr: "浙江省杭州市西湖区西斗门路9号福地创业园1号楼2楼",
bankno: "3301040160000822687", // bankAccount: "杭州淘粉吧网络技术股份有限公司",
sign_body: "舟山兰和科技有限公司", // openBank: "杭州银行学院路支行",
signBeginTime: "2019-10-24", // bankno: "3301040160000822687",
signEndTime: "2020-10-24", // sign_body: "舟山兰和科技有限公司",
contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_59111576475747388201916135547388contract_tfb.pdf", // signBeginTime: "2019-10-24",
business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_142111576475271657201916134751657bl_tfb.jpg", // signEndTime: "2020-10-24",
}, // contract_url: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_59111576475747388201916135547388contract_tfb.pdf",
dataView: { // business_license: "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_142111576475271657201916134751657bl_tfb.jpg",
actual_amt: "197701.2", // },
contractCount: 16, // dataView: {
income_tax: "0", // actual_amt: "197701.2",
}, // contractCount: 16,
} // income_tax: "0",
} // },
// },
this.userConfig = { // heifan: {
26: this.companyConfig.yd, // signCompanyIds: [10284],
29: this.companyConfig.yd, // }
30: this.companyConfig.tfb // }
}
// this.userConfig = {
// 26: this.companyConfig.yd,
// 29: this.companyConfig.yd,
// 44: this.companyConfig.heifan,
// 30: this.companyConfig.tfb
// }
} }
async test(pobj, query) { async test(pobj, query) {
...@@ -78,25 +84,27 @@ class XbgApi extends apiBase { ...@@ -78,25 +84,27 @@ class XbgApi extends apiBase {
} }
async setCompanyIds(qobj) { async setCompanyIds(qobj) {
var config = this.userConfig[qobj.userId]; let config = await this.userconfSve.findById(qobj.userId);
// var config = this.userConfig[qobj.userId];
if (!config) { if (!config) {
return; return;
} }
qobj.ecompany_id = config.signCompanyIds; qobj.ecompany_id = (config.signCompanyIds || "").split(",");
} }
async setPayCompanyIds(qobj) { async setPayCompanyIds(qobj) {
var config = this.userConfig[qobj.userId]; let config = await this.userconfSve.findById(qobj.userId);
// var config = this.userConfig[qobj.userId];
if (!config) { if (!config) {
return; return;
} }
qobj.busiIds = config.payCompanyIds; qobj.busiIds = (config.payCompanyIds || "").split(",");
} }
//合同模板 //合同模板
async etemplateList(qobj) { async etemplateList(qobj) {
var params = qobj || {}; var params = qobj || {};
this.setCompanyIds(params); await this.setCompanyIds(params);
if (!params.ecompany_id || params.ecompany_id.length == 0) { if (!params.ecompany_id || params.ecompany_id.length == 0) {
return system.getResultSuccess({count: 0, rows: []}) return system.getResultSuccess({count: 0, rows: []})
...@@ -114,7 +122,7 @@ class XbgApi extends apiBase { ...@@ -114,7 +122,7 @@ class XbgApi extends apiBase {
//已签合同 //已签合同
async acontractList(qobj) { async acontractList(qobj) {
var params = qobj || {}; var params = qobj || {};
this.setCompanyIds(params); await this.setCompanyIds(params);
if (!params.ecompany_id || params.ecompany_id.length == 0) { if (!params.ecompany_id || params.ecompany_id.length == 0) {
return system.getResultSuccess({count: 0, rows: []}) return system.getResultSuccess({count: 0, rows: []})
} }
...@@ -130,7 +138,7 @@ class XbgApi extends apiBase { ...@@ -130,7 +138,7 @@ class XbgApi extends apiBase {
//纳税人人员 //纳税人人员
async ratepayingListToPe(qobj) { async ratepayingListToPe(qobj) {
var params = qobj || {}; var params = qobj || {};
this.setPayCompanyIds(params); await this.setPayCompanyIds(params);
if (!params.busiIds || params.busiIds.length == 0) { if (!params.busiIds || params.busiIds.length == 0) {
return system.getResultSuccess({count: 0, rows: []}) return system.getResultSuccess({count: 0, rows: []})
} }
...@@ -147,7 +155,7 @@ class XbgApi extends apiBase { ...@@ -147,7 +155,7 @@ class XbgApi extends apiBase {
//纳税人按月 //纳税人按月
async ratepayingListToMonth(qobj) { async ratepayingListToMonth(qobj) {
var params = qobj || {}; var params = qobj || {};
this.setPayCompanyIds(params); await this.setPayCompanyIds(params);
if (!params.busiIds || params.busiIds.length == 0) { if (!params.busiIds || params.busiIds.length == 0) {
return system.getResultSuccess({count: 0, rows: []}) return system.getResultSuccess({count: 0, rows: []})
} }
...@@ -164,7 +172,7 @@ class XbgApi extends apiBase { ...@@ -164,7 +172,7 @@ class XbgApi extends apiBase {
async ratepayingListToOne(qobj) { async ratepayingListToOne(qobj) {
var params = qobj || {}; var params = qobj || {};
this.setPayCompanyIds(params); await this.setPayCompanyIds(params);
if (!params.busiIds || params.busiIds.length == 0) { if (!params.busiIds || params.busiIds.length == 0) {
return system.getResultSuccess({count: 0, rows: []}) return system.getResultSuccess({count: 0, rows: []})
} }
...@@ -180,11 +188,14 @@ class XbgApi extends apiBase { ...@@ -180,11 +188,14 @@ class XbgApi extends apiBase {
//数据概览 //数据概览
async dataOverview(qobj) { async dataOverview(qobj) {
var params = qobj || {}; var params = qobj || {};
var config = this.userConfig[qobj.userId]; let config = await this.userconfSve.findById(qobj.userId);
// var config = this.userConfig[qobj.userId];
if (!config) { if (!config) {
return system.getResultSuccess({}); return system.getResultSuccess({});
} }
qobj.busiIds = config.payCompanyIds; qobj.busiIds = (config.payCompanyIds || "").split(",");
// qobj.busiIds = config.payCompanyIds;
try { try {
var recruit_info = await this.recruitSve.findAllList(params); var recruit_info = await this.recruitSve.findAllList(params);
......
laowubao/app/base/db/impl/operator/userconfDao.js 0 → 100644
const system = require("../../../system");
const Dao = require("../../dao.base");
class UserConfDao extends Dao {
constructor() {
super(Dao.getModelName(UserConfDao));
}
}
module.exports = UserConfDao;
laowubao/app/base/db/models/operator/userconf.js 0 → 100644
const system=require("../../../system");
const settings=require("../../../../config/settings");
const uiconfig=system.getUiConfig2(settings.appKey);
module.exports = (db, DataTypes) => {
return db.define("userconf", {
signCompanyIds: DataTypes.STRING,
payCompanyIds: DataTypes.STRING,
dataView: DataTypes.STRING,
companyInfo: DataTypes.STRING,
},{
paranoid: true,//假的删除
underscored: true,
version: false,
freezeTableName: true,
//freezeTableName: true,
// define the table's name
tableName: 'user_conf',
validate: {
},
indexes:[
// Create a unique index on email
// {
// unique: true,
// fields: ['email']
// },
//
// // Creates a gin index on data with the jsonb_path_ops operator
// {
// fields: ['data'],
// using: 'gin',
// operator: 'jsonb_path_ops'
// },
//
// // By default index name will be [table]_[fields]
// // Creates a multi column partial index
// {
// name: 'public_by_author',
// fields: ['author', 'status'],
// where: {
// status: 'public'
// }
// },
//
// // A BTREE index with a ordered field
// {
// name: 'title_index',
// method: 'BTREE',
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// }
]
});
}
laowubao/app/base/service/impl/operator/userconfSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../sve.base");
const settings = require("../../../../config/settings");
class UserConfService extends ServiceBase {
constructor() {
super("operator", ServiceBase.getDaoName(UserConfService));
}
}
module.exports = UserConfService;
laowubao/app/config/localsettings.js
...@@ -6,7 +6,7 @@ var settings={ ...@@ -6,7 +6,7 @@ var settings={
db:10, db:10,
}, },
database:{ database:{
dbname : "laowubao", dbname : "laowubao2",
// user : "root", // user : "root",
// password : "root", // password : "root",
user: "write", user: "write",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment