Skip to content

Y
yafangsuo_applet
Commit c8ee483b by lixinming
Options

no message

parent f40ef27c
Showing with 158 additions and 163 deletions
src/biz/abi/partyBuilding.ts
...@@ -12,83 +12,83 @@ import { selectData } from "../../middleware/databaseSuccess"; ...@@ -12,83 +12,83 @@ import { selectData } from "../../middleware/databaseSuccess";
* @returns {baseData:基本情况, ratio:男女占比, qualifications:学历情况, ageDistribution:年龄分布, partyExpenses:党费管理} * @returns {baseData:基本情况, ratio:男女占比, qualifications:学历情况, ageDistribution:年龄分布, partyExpenses:党费管理}
*/ */
export async function getLeftScreen() { export async function getLeftScreen() {
let baseData = {title:"基本情况", list:[]}; let baseData = {title:"基本情况", list:[]};
baseData.list.push( baseData.list.push(
{key:"支部", value:await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.支部表, {}, null)}, {key:"支部", value:await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.支部表, {}, null)},
{key:"正式党员", value:await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {etId:enums.ENTRYTYPE.正式党员}, null)}, {key:"正式党员", value:await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {etId:enums.ENTRYTYPE.正式党员}, null)},
{key:"预备党员", value:await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {etId:enums.ENTRYTYPE.预备党员}, null)} {key:"预备党员", value:await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {etId:enums.ENTRYTYPE.预备党员}, null)}
); );
let male = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {sex:enums.SEX.男}, null); let male = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {sex:enums.SEX.男}, null);
let female = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {sex:enums.SEX.女}, null); let female = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {sex:enums.SEX.女}, null);
let ratio = {title:"男女占比", list:[{key:"男", value:male},{key:"女", value:female}]}; let ratio = {title:"男女占比", list:[{key:"男", value:male},{key:"女", value:female}]};
let qualifications = {title:"学历情况", list:[]}; let qualifications = {title:"学历情况", list:[]};
for(let key in enums.DEGREE) { for(let key in enums.DEGREE) {
let anyKey:any = key; let anyKey:any = key;
if (isNaN(anyKey)) { if (isNaN(anyKey)) {
let keyStr = key; let keyStr = key;
let levelOfEducation = enums.DEGREE[key]; let levelOfEducation = enums.DEGREE[key];
let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {levelOfEducation}, null); let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {levelOfEducation}, null);
qualifications.list.push({key:keyStr, value:count}); qualifications.list.push({key:keyStr, value:count});
} }
} }
let ageDistribution = {title:"年龄分布", list:[]}; let ageDistribution = {title:"年龄分布", list:[]};
let ageDistributionMap = { let ageDistributionMap = {
小于29: 0, 小于29: 0,
大于30小于39: 0, 大于30小于39: 0,
大于40小于49: 0, 大于40小于49: 0,
大于50: 0, 大于50: 0,
} }
let 小于29 = {"birthDate": {"%gt%": moment().add(-29, 'y').format("YYYY-MM-DD HH:mm:ss")}}; let 小于29 = {"birthDate": {"%gt%": moment().add(-29, 'y').format("YYYY-MM-DD HH:mm:ss")}};
ageDistributionMap.小于29 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 小于29, ["birthDate"]); ageDistributionMap.小于29 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 小于29, ["birthDate"]);
let 大于30小于39 = {"birthDate": {"%between%": [moment().add(-39, 'y').format("YYYY-MM-DD HH:mm:ss"), moment().add(-30, 'y').format("YYYY-MM-DD HH:mm:ss")]}}; let 大于30小于39 = {"birthDate": {"%between%": [moment().add(-39, 'y').format("YYYY-MM-DD HH:mm:ss"), moment().add(-30, 'y').format("YYYY-MM-DD HH:mm:ss")]}};
ageDistributionMap.大于30小于39 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 大于30小于39, ["birthDate"]); ageDistributionMap.大于30小于39 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 大于30小于39, ["birthDate"]);
let 大于40小于49 = {"birthDate": {"%between%": [moment().add(-49, 'y').format("YYYY-MM-DD HH:mm:ss"), moment().add(-40, 'y').format("YYYY-MM-DD HH:mm:ss")]}}; let 大于40小于49 = {"birthDate": {"%between%": [moment().add(-49, 'y').format("YYYY-MM-DD HH:mm:ss"), moment().add(-40, 'y').format("YYYY-MM-DD HH:mm:ss")]}};
ageDistributionMap.大于40小于49 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 大于40小于49, ["birthDate"]); ageDistributionMap.大于40小于49 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 大于40小于49, ["birthDate"]);
let 大于50 = {"birthDate": {"%lt%": moment().add(-50, 'y').format("YYYY-MM-DD HH:mm:ss")}}; let 大于50 = {"birthDate": {"%lt%": moment().add(-50, 'y').format("YYYY-MM-DD HH:mm:ss")}};
ageDistributionMap.大于50 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 大于50, ["birthDate"]); ageDistributionMap.大于50 = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, 大于50, ["birthDate"]);
for (let key in ageDistributionMap) { for (let key in ageDistributionMap) {
ageDistribution.list.push({key, value: ageDistributionMap[key]}); ageDistribution.list.push({key, value: ageDistributionMap[key]});
} }
let partyExpenses = {title:"党费管理", list: []}; let partyExpenses = {title:"党费管理", list: []};
let stTime = moment(new Date().valueOf()).startOf("month").format("YYYY-MM-DD HH:mm:ss"); let stTime = moment(new Date().valueOf()).startOf("month").format("YYYY-MM-DD HH:mm:ss");
let etTime = moment(new Date().valueOf()).endOf('month').format("YYYY-MM-DD HH:mm:ss"); let etTime = moment(new Date().valueOf()).endOf('month').format("YYYY-MM-DD HH:mm:ss");
let monthParam = {payType:enums.PAYTYPE.已缴纳, payTime:{"%between%":[stTime, etTime]}}; let monthParam = {payType:enums.PAYTYPE.已缴纳, payTime:{"%between%":[stTime, etTime]}};
let monthPayment = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党费管理表, monthParam, ["payAmount"]); let monthPayment = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党费管理表, monthParam, ["payAmount"]);
let payAmount = 0; let payAmount = 0;
monthPayment.forEach( item => { monthPayment.forEach( item => {
payAmount += item.payAmount; payAmount += item.payAmount;
}) })
partyExpenses["monthPayment"] = payAmount; partyExpenses["monthPayment"] = payAmount;
let paymentCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {}, null); let paymentCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党员基础信息表, {}, null);
let paidCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党费管理表, {payType:enums.PAYTYPE.已缴纳}, null); let paidCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.党费管理表, {payType:enums.PAYTYPE.已缴纳}, null);
partyExpenses["paymentRatio"] = Math.round((paidCount / paymentCount)*100)/100; partyExpenses["paymentRatio"] = Math.round((paidCount / paymentCount)*100)/100;
for(let key in enums.BRANCHNAME) { for(let key in enums.BRANCHNAME) {
let anyKey:any = key; let anyKey:any = key;
if (isNaN(anyKey)) { if (isNaN(anyKey)) {
let keyStr = key; let keyStr = key;
let bId = enums.BRANCHNAME[key]; let bId = enums.BRANCHNAME[key];
let param = { let param = {
bId, bId,
payType: enums.PAYTYPE.已缴纳, payType: enums.PAYTYPE.已缴纳,
payTime: {"%between%":[stTime, etTime]} payTime: {"%between%":[stTime, etTime]}
} }
let branchPayment = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党费管理表, param, ["payAmount"]); let branchPayment = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党费管理表, param, ["payAmount"]);
let branchPayAmount = 0; let branchPayAmount = 0;
branchPayment.forEach( item => { branchPayment.forEach( item => {
branchPayAmount += item.payAmount; branchPayAmount += item.payAmount;
}) })
partyExpenses.list.push({key:keyStr, value:branchPayAmount}); partyExpenses.list.push({key:keyStr, value:branchPayAmount});
} }
} }
return {baseData, ratio, qualifications, ageDistribution, partyExpenses}; return {baseData, ratio, qualifications, ageDistribution, partyExpenses};
} }
...@@ -98,102 +98,96 @@ export async function getLeftScreen() { ...@@ -98,102 +98,96 @@ export async function getLeftScreen() {
* @returns {partyQualityList:党建质量雷达图, branchPartyQuality:各支部党建质量评分, buildingDynamic:党建动态} * @returns {partyQualityList:党建质量雷达图, branchPartyQuality:各支部党建质量评分, buildingDynamic:党建动态}
*/ */
export async function getMidScreen(year:string) { export async function getMidScreen(year:string) {
let clomun = ["primaryIndicators", "completionProgress"]; let clomun = ["primaryIndicators", "completionProgress"];
let partyQuality = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {dataYear:year}, clomun); let partyQuality = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {dataYear:year}, clomun);
let partyQualityList = {title:"党建质量雷达图", list:[]}; let indicatorsMap = {};
for (let key in enums.PRIMARYINDICATORS) { partyQuality.forEach( info => {
let anyKey:any = key; let {primaryIndicators, completionProgress} = info; //一级指标、完成进度
if (isNaN(anyKey)) { if (!indicatorsMap[primaryIndicators]) indicatorsMap[primaryIndicators] = {count:0, completionProgress:0};
const EnumValue = parseInt(enums.PRIMARYINDICATORS[key]) indicatorsMap[primaryIndicators].completionProgress += completionProgress;
let completion = 0 indicatorsMap[primaryIndicators].count += 1;
let count = 0; });
partyQuality.forEach( info => { let partyQualityList = {title:"党建质量雷达图", list:[]};//list:[{key:一级指标名称,value:一级指标数量:0}]
let {primaryIndicators, completionProgress} = info; //一级指标、完成进度 for (let key in indicatorsMap) {
if (primaryIndicators == EnumValue) { let {count, completionProgress} = indicatorsMap[key];
completion += completionProgress; let keyStr = enums.PRIMARYINDICATORS[key];
count++; partyQualityList.list.push({
} key:keyStr,
}) value:Math.round((completionProgress / count)*100)/100
}
let changeData = { );
key:anyKey, }
value:Math.round((completion / count)*100)/100
}; let branchPartyQuality = {title:"各支部党建质量评分", list:[]};
for(let key in enums.BRANCHNAME) {
partyQualityList.list.push(changeData); let anyKey:any = key;
} if (isNaN(anyKey)) {
} let keyStr = key;
let bId = enums.BRANCHNAME[key];
let branchPartyQuality = {title:"各支部党建质量评分", list:[]}; let branchPartyQualityInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {bId}, ["currentScore"]);
for(let key in enums.BRANCHNAME) { let branchScore = 0;
let anyKey:any = key; branchPartyQualityInfo.forEach( item => {
if (isNaN(anyKey)) { branchScore += item.currentScore;
let keyStr = key; })
let bId = enums.BRANCHNAME[key]; branchPartyQuality.list.push({key:keyStr, value:branchScore});
let branchPartyQualityInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {bId}, ["currentScore"]); }
let branchScore = 0;
branchPartyQualityInfo.forEach( item => {
branchScore += item.currentScore;
})
branchPartyQuality.list.push({key:keyStr, value:branchScore});
} }
}
let buildingDynamic = {title:"党建动态", list:[]}; let buildingDynamic = {title:"党建动态", list:[]};
buildingDynamic.list = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, {}, ["theme"]) buildingDynamic.list = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建动态表, {}, ["theme"])
return {partyQualityList, branchPartyQuality, buildingDynamic}; return {partyQualityList, branchPartyQuality, buildingDynamic};
} }
/** /**
* 党建分析——右屏 * 党建分析——右屏
* @returns {activity:组织生活, basicSystem:, totalIntegral, partyVanguard} * @returns {activity:组织生活, basicSystem:, totalIntegral, partyVanguard}
*/ */
export async function getRightScreen() { export async function getRightScreen() {
let activity = {title:"组织生活", activityCount:0, list:[]} let activity = {title:"组织生活", activityCount:0, list:[]}
activity.activityCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.组织生活表, {}, null); //组织生活总数 activity.activityCount = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.组织生活表, {}, null); //组织生活总数
for(let key in enums.BRANCHNAME) { for(let key in enums.BRANCHNAME) {
let anyKey:any = key; let anyKey:any = key;
if (isNaN(anyKey)) { if (isNaN(anyKey)) {
let keyStr = key; let keyStr = key;
let bId = enums.BRANCHNAME[key]; let bId = enums.BRANCHNAME[key];
let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.组织生活表, {bId}, null); let count = await selectData(OPERATIONALDATATYPE.查询数据量, TABLENAME.组织生活表, {bId}, null);
activity.list.push({key:keyStr, value:count}); activity.list.push({key:keyStr, value:count});
} }
} }
let basicSystem = {title:"基本制度", list:[]}; let basicSystem = {title:"基本制度", list:[]};
basicSystem.list = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.支部制度表, {}, ["systemTitle"]); basicSystem.list = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.支部制度表, {}, ["systemTitle"]);
let totalIntegral = {title:"学习强国", monthTotalScore:0, list:[]}; let totalIntegral = {title:"学习强国", monthTotalScore:0, list:[]};
let totalScore = 0; let totalScore = 0;
for(let key in enums.BRANCHNAME) { for(let key in enums.BRANCHNAME) {
let anyKey:any = key; let anyKey:any = key;
if (isNaN(anyKey)) { if (isNaN(anyKey)) {
let keyStr = key; let keyStr = key;
let bId = enums.BRANCHNAME[key]; let bId = enums.BRANCHNAME[key];
let totalIntegralInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.学习强国, {bId}, ["totalIntegral"]); let totalIntegralInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.学习强国, {bId}, ["totalIntegral"]);
let changeScore = 0; let changeScore = 0;
totalIntegralInfo.forEach(item => { totalIntegralInfo.forEach(item => {
changeScore += item.totalIntegral; changeScore += item.totalIntegral;
totalScore += item.totalIntegral; totalScore += item.totalIntegral;
}) })
totalIntegral.list.push({key:keyStr, value:changeScore}); totalIntegral.list.push({key:keyStr, value:changeScore});
}
} }
} totalIntegral.monthTotalScore = totalScore;
totalIntegral.monthTotalScore = totalScore;
let partyVanguard = {title:"党建先锋", list:[]}; let partyVanguard = {title:"党建先锋", list:[]};
let partyVanguardInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建先锋表, {}, ["honorName", "grantTime"]); let partyVanguardInfo = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建先锋表, {}, ["honorName", "grantTime"]);
partyVanguardInfo.forEach( item => { partyVanguardInfo.forEach( item => {
let grantTime = moment(item.grantTime).format("YYYY-MM-DD"); let grantTime = moment(item.grantTime).format("YYYY-MM-DD");
partyVanguard.list.push({honorName:item.honorName, grantTime}); partyVanguard.list.push({honorName:item.honorName, grantTime});
}) })
return {activity, basicSystem, totalIntegral, partyVanguard}; return {activity, basicSystem, totalIntegral, partyVanguard};
} }
src/biz/abi/target.ts
...@@ -11,6 +11,7 @@ export async function getTargetData() { ...@@ -11,6 +11,7 @@ export async function getTargetData() {
let clomun = ["tlId", "primaryIndicators", "secondaryIndicators", "thirdLevelContent", "thirdLevelScore", "currentScore", "completionProgress"]; let clomun = ["tlId", "primaryIndicators", "secondaryIndicators", "thirdLevelContent", "thirdLevelScore", "currentScore", "completionProgress"];
let partyQualityData = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {}, clomun); let partyQualityData = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, {}, clomun);
//todo优化一下 循环方式反了，参考partyBuilding 中的getMidScreen的写法
let partyQualityList = []; let partyQualityList = [];
for (let key in PRIMARYINDICATORS) { for (let key in PRIMARYINDICATORS) {
let primaryIndicatorsData = {}; let primaryIndicatorsData = {};
......
src/biz/base.ts
...@@ -24,7 +24,7 @@ import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum"; ...@@ -24,7 +24,7 @@ import { OPERATIONALDATATYPE, TABLENAME } from "../config/dbEnum";
let branch = changeEnumValue(configEnum.BRANCHNAME, bId); //支部名称 let branch = changeEnumValue(configEnum.BRANCHNAME, bId); //支部名称
let param = { bId }; let param = { bId };
let partyQualityScore = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量, param, ["thirdLevelScore", "currentScore"]); let partyQualityScore = await selectData(OPERATIONALDATATYPE.查询多个, TABLENAME.党建质量三级指标, param, ["thirdLevelScore", "currentScore"]);
let massIndex = 0;//得分 let massIndex = 0;//得分
let massCount = 0;//总分 let massCount = 0;//总分
......
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