no message

src/biz/memberLearning.ts

@@ -33,7 +33,7 @@ export async function memberLearningList(pmId:string, courseEntryType:number, co
         rateLearningMap[mlId] = {rlId, rateOfLearning, learningCompleted, textSchedule};
     });
 
-    let param = {courseEntryType};
+    let param = {isDelete:false, courseEntryType};
     if(courseTypeName) param["courseTypeName"] = courseTypeName;
     if(contentTitle) param["contentTitle"] = {"%like%": contentTitle};
 
@@ -142,7 +142,7 @@ export async function branchRanking(pmId, bId?) {
 
 
 /**
- * 修改学习进度
+ * 修改视频学习进度
  * @param rlId 学习进度id
  * @param rateOfLearning 学习进度
  */
@@ -159,26 +159,42 @@ export async function updateRateOfLearning(rlId:number, rateOfLearning:number) {
 }
 
 
+/**
+ * 修改文字学习进度
+ * @param rlId 
+ * @param fileName 
+ * @returns 
+ */
 export async function updateDocRateOfLearning(rlId:number, fileName:string) {
     let rateLearningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {rlId}, ["pmId", "rlId", "textSchedule"]);
     if (!rateLearningInfo || !rateLearningInfo.rlId) throw new BizError(ERRORENUM.目标数据不存在, `更新学习进度:rlid:${rlId}`);
     let {pmId} = rateLearningInfo;
-    let learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {pmId}, ["pmId", "mlId"]);
+    let learningInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.学习进度表, {rlId}, ["pmId", "mlId", "rateOfLearning"]);
     if (!learningInfo || !learningInfo.pmId) throw new BizError(ERRORENUM.目标数据不存在, `更新学习进度:pmId:${pmId}`);
-    let mlInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员学习表, {mlId:learningInfo.mlId}, ["courseEntryType"]);
+    let mlInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党员学习表, {mlId:learningInfo.mlId}, ["courseEntryType", "fileName"]);
     if (mlInfo.courseEntryType != 2) throw new BizError(ERRORENUM.该进度不是文字学习, `${pmId}`);
-
+    let mlFileName = JSON.parse(mlInfo.fileName);
     let textSchedule = !rateLearningInfo.textSchedule ? [] : JSON.parse( rateLearningInfo.textSchedule);
 
     let isUpdate = false;
-    if (textSchedule.indexOf(fileName) == -1) {
+    if (textSchedule.indexOf(fileName) == -1 && textSchedule.indexOf(mlFileName) > 0 || mlFileName.indexOf(fileName) >= 0) {
         isUpdate =  true;
         textSchedule.push(fileName);
     }
 
+    let fileNum = mlFileName.length; 
     if (isUpdate) {
-        let row = await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, {textSchedule:JSON.stringify(textSchedule)}, {rlId});
-        console.log();
+        let thisFileRate = Math.ceil(100/fileNum); //根据学习课程的文件数量计算本次学习的进度占比
+        let rateOfLearning = learningInfo.rateOfLearning;
+        if (rateOfLearning < 100) rateOfLearning = rateOfLearning + thisFileRate;
+        let learningCompleted = 1;
+        if (rateOfLearning >= 100) { //学习进度大于等于100时，将学习进度修改为100，修改学习状态为已完成
+            rateOfLearning = 100;
+            learningCompleted = 2; 
+        }
+
+        let row = await operationalData(OPERATIONALDATATYPE.修改, TABLENAME.学习进度表, {textSchedule:JSON.stringify(textSchedule), learningCompleted, rateOfLearning}, {rlId});
+        console.log(row);
     }
 
     return {isSuccess:true};
@@ -194,3 +210,6 @@ export async function updateDocRateOfLearning(rlId:number, fileName:string) {
 
 
 
+
+
+

src/biz/partyBuildingDynamic.ts

@@ -60,11 +60,17 @@ export async function partyBuildingDynamicList(bId:number, theme:string, activit
 export async function partyBuildingDynamicDetsils(pbId:number, pbType:number, token:string, userid:string) {
     let clomun = ["theme", "dataMonth", "fileName"];
     let partyBuildingDynamicInfo:any = {};
-    if (pbType == PBTYPE.党建资讯) partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.专题活动表, {taId: pbId}, clomun);
-    if (pbType == PBTYPE.党建动态) partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党建动态表, {pbId}, clomun);
+    let fileNameList;
+    if (pbType == PBTYPE.党建资讯) {
+        partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.专题活动表, {taId: pbId}, clomun);
+        fileNameList = getFileUrl(partyBuildingDynamicInfo.fileName, token, UPTYPE.专题活动, userid);
+    }
+    if (pbType == PBTYPE.党建动态) {
+        partyBuildingDynamicInfo = await selectData(OPERATIONALDATATYPE.查询单个, TABLENAME.党建动态表, {pbId}, clomun);
+        fileNameList = getFileUrl(partyBuildingDynamicInfo.fileName, token, UPTYPE.党建动态, userid);
+    }
 
     partyBuildingDynamicInfo.dataMonth = moment(partyBuildingDynamicInfo.dataMonth).format("YYYY-MM-DD");
-    let fileNameList = getFileUrl(partyBuildingDynamicInfo.fileName, token, UPTYPE.党建动态, userid);
     partyBuildingDynamicInfo.fileName = fileNameList;
 
     return partyBuildingDynamicInfo;

src/biz/partyExpenses.ts

@@ -48,6 +48,7 @@ import { changeEnumValue } from "../util/verificationEnum";
         let {name, etId, pmId, partyPositionsName, departmentName, partyJoiningTime} = info;
         let expInfo = expMap[pmId];
 
+        if(!expInfo && payType!=configEnum.PAYTYPE.已缴纳) expInfo = {payType: configEnum.PAYTYPE.未缴纳, payTime: timeStr}; //对应党员没有缴纳信息返回一条本月未缴纳数据
         if (expInfo) {
             let payTime = "";
             if(expInfo.payTime) payTime = moment(expInfo.payTime).format("YYYY-MM-DD");
@@ -82,7 +83,7 @@ import { changeEnumValue } from "../util/verificationEnum";
     let baseMember = await selectData(OPERATIONALDATATYPE.查询多个 , TABLENAME.党员基础信息表, {etId: 1, bId: {"%like%": bId}}, memberClomun);
     
     let baseData = { //基础数据
-        partyCount:baseMember.length,//党员总数,
+        partyCount:baseMember.length,//党员总数
         paid:0, // 已缴纳
         unpaid:0 // 未缴纳
     };

src/util/bizError.ts

@@ -24,3 +24,4 @@ export class BizError extends Error {
         super(reqErrorMsg);
     }
 }
+