feat: 显示问题

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

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