feat: 小程序我的任务重不展示0积分的

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -528,7 +528,7 @@ public class ApiController {
 				mapOne.put("rljCertStatus", sysU.getRljCertStatus());
 				mapOne.put("userSign", sysU.getUserSign());
 				mapOne.put("certRemark", sysU.getCertRemark());
-				mapOne.put("taxHelperAgreementSignature",sysU.getTaxHelperAgreementSignature());
+				mapOne.put("taxHelperAgreementSignature", sysU.getTaxHelperAgreementSignature());
 
 				if (redisTemplate.hasKey(CacheConstants.USER_NOTICE_KEY + sysU.getUserId())) {
 					mapOne.put("notice", true);
@@ -2039,19 +2039,18 @@ public class ApiController {
 	@GetMapping("/getTaskListByPackageId")
 	public R getTaskListByPackageId(Page page, WmTask wmTask) {
 
-//		LambdaQueryWrapper<WmTask> queryWrapper = Wrappers.lambdaQuery();
-//		Page<WmTask> taskPage = null;
-		Integer userId = SecurityUtils.getUser().getId();
+		Page<WmTask> taskPage = wmTaskService.page(page,
+				Wrappers.<WmTask>lambdaQuery()
+						.eq(WmTask::getScorePackageId, wmTask.getScorePackageId())
+						.eq(WmTask::getTaskUserId, wmTask.getTaskUserId())
+						.ne(WmTask::getScore, 0)
+						.orderByDesc(WmTask::getCreateTime));
 
-		Page<WmTask> taskPage = wmTaskService.page(page, Wrappers.query(wmTask)
-				.lambda()
-				.orderByDesc(WmTask::getCreateTime));
 		List<WmTask> wmTaskList = taskPage.getRecords();
 
-		WmTaskType typeQuery = new WmTaskType();
-		typeQuery.setTaskTypeLevel("1");
 		List<WmTaskType> wmTaskTypeList = wmTaskTypeService.
-				list(Wrappers.query(typeQuery).lambda());
+				list(Wrappers.<WmTaskType>lambdaQuery().eq(WmTaskType::getTaskTypeLevel, "1"));
+
 		Map<String, String> typeMap = wmTaskTypeList.stream()
 				.collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getTaskTypeName));
 
@@ -2271,9 +2270,9 @@ public class ApiController {
 		List<Integer> roles = SecurityUtils.getRoles();
 
 		// 如果角色中包含全职和兼职就需要校验身份证年龄
-		if (roles.contains(5) || roles.contains(6)){
+		if (roles.contains(5) || roles.contains(6)) {
 			// 校验身份证上的年龄
-			if(StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())){
+			if (StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())) {
 				int ageByIdCard = IdcardUtil.getAgeByIdCard(userUpdateInput.getIdCardNumber());
 				if (ageByIdCard < 18) {
 					return R.failed("年龄未满十八");
@@ -2443,8 +2442,9 @@ public class ApiController {
 		// 姓名去除空格（包括字符之间的所有空格都会去除）
 		sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
 		sysUser.setUserSign(userUpdateInput.getUserSign());
-		if (StringUtils.isNotEmpty(userUpdateInput.getTaxHelperAgreementSignature())){
-			sysUser.setTaxHelperAgreementSignature(StringUtils.equals(SignatureStatusEnum.SIGNED.name(), userUpdateInput.getTaxHelperAgreementSignature()) ? 1 : 0);
+		if (StringUtils.isNotEmpty(userUpdateInput.getTaxHelperAgreementSignature())) {
+			sysUser.setTaxHelperAgreementSignature(StringUtils.equals(SignatureStatusEnum.SIGNED.name(), userUpdateInput
+					.getTaxHelperAgreementSignature()) ? 1 : 0);
 		}
 		sysUserService.updateById(sysUser);
 
@@ -2912,18 +2912,18 @@ public class ApiController {
 				if ("3".equals(wmScorePackage.getPackageType1())) {
 					continue;
 				}
-				if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList())){
+				if (ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList())) {
 					continue;
 				}
 				boolean flag = false;
-				for (String name : wmScorePackage.getDrugProducerList() ){
-					if (StringUtils.equals(name, drugProducer)){
+				for (String name : wmScorePackage.getDrugProducerList()) {
+					if (StringUtils.equals(name, drugProducer)) {
 						flag = true;
 						break;
 					}
 				}
 
-				if (!flag){
+				if (!flag) {
 					continue;
 				}
 
@@ -2974,7 +2974,7 @@ public class ApiController {
 	 * @return 结果
 	 */
 	private R<?> shareAndReadTaskMethod(String id, String shareUserId, String openUserId, String type, String packageId,
-									 String sharePicUrl, String taskCategoryName) {
+										String sharePicUrl, String taskCategoryName) {
 
 		LocalDateTime now = LocalDateTime.now();
 		int score = 0;
@@ -3024,7 +3024,7 @@ public class ApiController {
 					String info = null;
 					if ("album".equalsIgnoreCase(taskCategoryName)) {
 						info = checkAlbumLimit(wmWkAlbum, sysUser);
-					} else if ("article".equalsIgnoreCase(taskCategoryName)){
+					} else if ("article".equalsIgnoreCase(taskCategoryName)) {
 						info = checkArticleLimit(wmWkArticle, sysUser);
 					}
 					if (StringUtils.isNotEmpty(info)) {
@@ -3147,9 +3147,9 @@ public class ApiController {
 					}
 
 					// 校验打开结果
-					if (needToCheckLimit){
+					if (needToCheckLimit) {
 						if ("article".equalsIgnoreCase(taskCategoryName)) {
-							needToCheckLimit = checkArticleOpenLimit(wmWkArticle,sysUser,wmTask);
+							needToCheckLimit = checkArticleOpenLimit(wmWkArticle, sysUser, wmTask);
 						} else if ("album".equalsIgnoreCase(taskCategoryName)) {
 							needToCheckLimit = checkAlbumOpenLimit(wmWkAlbum, sysUser, wmTask);
 						}
@@ -3210,7 +3210,7 @@ public class ApiController {
 				}
 
 				// 校验结果为0积分的自动审核不通过
-				if (autoRejectFlag){
+				if (autoRejectFlag) {
 					wmTask.setTaskStatus("4");
 					wmTask.setSubmitStatus("1");
 				}
@@ -3298,11 +3298,12 @@ public class ApiController {
 
 	/**
 	 * 文章打开判断
+	 *
 	 * @param article 文章
 	 * @param user    分享用户
-	 * @param task	  任务
+	 * @param task    任务
 	 */
-	private Boolean checkArticleOpenLimit(WmWkArticle article, SysUser user, WmTask task){
+	private Boolean checkArticleOpenLimit(WmWkArticle article, SysUser user, WmTask task) {
 		Assert.notNull(article);
 		LocalDateTime now = LocalDateTime.now();
 		final String cacheKey = CacheConstants.ARTICLE_PERSONAL_SHARE_KEY + DateUtil.format(now, "yyyyMMdd:")
@@ -3323,15 +3324,15 @@ public class ApiController {
 	 * @param user  分享用户
 	 * @param task  任务
 	 */
-	private Boolean checkAlbumOpenLimit(WmWkAlbum album, SysUser user, WmTask task){
+	private Boolean checkAlbumOpenLimit(WmWkAlbum album, SysUser user, WmTask task) {
 		Assert.notNull(album);
 		if (StringUtils.isNotEmpty(album.getGlyp())) {
 			List<WmDaDrugEntDrugtable> drugTableList =
 					wmDaDrugEntDrugtableService.listByIds(Arrays.asList(album.getGlyp().split(",")));
 			if (CollectionUtils.isNotEmpty(drugTableList)) {
 				String date = DateUtil.today() + ":";
-				log.info("DateUtil.today():{}",date);
-				for (WmDaDrugEntDrugtable drug : drugTableList){
+				log.info("DateUtil.today():{}", date);
+				for (WmDaDrugEntDrugtable drug : drugTableList) {
 					if (StringUtils.isEmpty(drug.getDrugEntId())) {
 						continue;
 					}