瀏覽代碼

feat: 显示问题

shc 3 年之前
父節點
當前提交
b93ea42615

+ 9 - 7
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -1984,20 +1984,22 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 
 		// 设置
-		scorePackage.setYsh(yshtt > 100 ? scorePackage.getScore() : ysh);
+		scorePackage.setYsh(yshtt >= 100 ? scorePackage.getScore() : ysh);
 		scorePackage.setYjd((int) yjd);
 		scorePackage.setYjddsh((int) yjddsh);
 		scorePackage.setDsh(dsh);
-		scorePackage.setShtg(shtg);
-		scorePackage.setShbtg(shbtg);
-		scorePackage.setShbtgnum((int) shbtgnum);
-		scorePackage.setShtgnum((int) shtgnum);
+		if (!StrUtil.equalsAny(scorePackage.getScorePackageStatus(),"1","6")){
+			scorePackage.setShtg(shtg);
+			scorePackage.setShbtg(shbtg);
+			scorePackage.setShbtgnum((int) shbtgnum);
+			scorePackage.setShtgnum((int) shtgnum);
+			scorePackage.setShtgtt((int) shtgtt);
+			scorePackage.setShbtgtt((int) shbtgtt);
+		}
 		scorePackage.setDsh(dsh);
 		scorePackage.setIsTask(scorePackage.getId());
 		scorePackage.setYtj(ytj);
 		scorePackage.setYshtt((int) yshtt);
-		scorePackage.setShtgtt((int) shtgtt);
-		scorePackage.setShbtgtt((int) shbtgtt);
 		scorePackage.setPackageType1(type1Lable);
 		scorePackage.setPackageType2(type2Lable);
 		scorePackage.setRelationScoreId(relationScorePackage != null ? relationScorePackage.getScorePackageName(): null);