修改需求详情接口

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/requiremanager/service/impl/HwRequirementServiceImpl.java

@@ -351,7 +351,7 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
         String pageNo = requestMap.get("pageNo");
         String pageSize = requestMap.get("pageSize");
         HwRequirementAPI hwRequirementAPI = new HwRequirementAPI();
-        if(StringUtils.isNotBlank(userId)){
+        if (StringUtils.isNotBlank(userId)) {
             HwUser hwUser = hwUserService.getById(userId);
             hwRequirementAPI.setSysOrgCode(hwUser.getSysOrgCode());
             hwRequirementAPI.setUserId(userId);
@@ -384,9 +384,9 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
             for (int i = 0; i < pageList.getRecords().size(); i++) {
                 HwRequirementAPI hwRequirementAPI1 = pageList.getRecords().get(i);
                 //判断报名表userid是否存在，存在表示已报名
-                if(StringUtils.isNotBlank(hwRequirementAPI1.getUserId())){
+                if (StringUtils.isNotBlank(hwRequirementAPI1.getUserId())) {
                     hwRequirementAPI1.setIsEnrollment(true);
-                }else{
+                } else {
                     hwRequirementAPI1.setIsEnrollment(false);
                 }
                 //拼接阿里云路径
@@ -419,24 +419,24 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
     public Map<String, Object> getRequirementDetail(Map<String, String> requestMap, HttpServletRequest request, HttpServletResponse response) {
         Map<String, Object> returnMap = new HashMap<String, Object>();
         String userId = requestMap.get("user_id");
-        String userToken = requestMap.get("user_token");
-        //验证用户合法性
-        if (TokenUtil.validateToken(userId, userToken)) {
-            String hwRequirementId = requestMap.get("hwRequirementId");  //需求主键id
-            HwRequirementAPI hwRequirementAPI = this.getRequirementById(hwRequirementId);
-            HwEnrollment hwEnrollment = new HwEnrollment();
-            hwEnrollment.setUserId(Integer.parseInt(userId));
-            hwEnrollment.setRequirementId(Integer.parseInt(hwRequirementId));
-            List<HwEnrollment> hwEnrollmentList = hwEnrollmentService.findHwEnrollmentList(hwEnrollment);
-            if (hwEnrollmentList.size() > 0) {
-                returnMap.put("needEnrollment", false);
-            } else {
-                returnMap.put("needEnrollment", true);
+        String hwRequirementId = requestMap.get("hwRequirementId");  //需求主键id
+        HwRequirementAPI hwRequirementAPI = this.getRequirementById(hwRequirementId);
+        HwEnrollment hwEnrollment = new HwEnrollment();
+        hwEnrollment.setUserId(Integer.parseInt(userId));
+        hwEnrollment.setRequirementId(Integer.parseInt(hwRequirementId));
+        List<HwEnrollment> hwEnrollmentList = hwEnrollmentService.findHwEnrollmentList(hwEnrollment);
+        if (hwEnrollmentList.size() > 0) {
+            returnMap.put("needEnrollment", false);
+            List<HwOrder> hwOrderList = hwOrderService.findHwOrderByEnrollId(String.valueOf(hwEnrollmentList.get(0).getId()));
+            if(hwOrderList.size()>0){
+                returnMap.put("displayCancel", false);
+            }else{
+                returnMap.put("displayCancel", true);
             }
-            returnMap.put("hwRequirementAPI", hwRequirementAPI);
         } else {
-            returnMap.put("success", "1004");
+            returnMap.put("needEnrollment", true);
         }
+        returnMap.put("hwRequirementAPI", hwRequirementAPI);
         return returnMap;
     }
 
@@ -511,11 +511,11 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
 //            }
             hwEnrollmentService.save(hwEnrollment);
             //保存用户信息
-            HwUser hwUser=hwUserService.getById(userId);
-            if(StringUtils.isNotBlank(idcardNumber)){
+            HwUser hwUser = hwUserService.getById(userId);
+            if (StringUtils.isNotBlank(idcardNumber)) {
                 hwUser.setIdcardNumber(idcardNumber);
             }
-            if(StringUtils.isNotBlank(name)){
+            if (StringUtils.isNotBlank(name)) {
                 hwUser.setName(name);
             }
             hwUserService.updateById(hwUser);
@@ -598,10 +598,10 @@ public class HwRequirementServiceImpl extends ServiceImpl<HwRequirementMapper, H
         if (TokenUtil.validateToken(userId, userToken)) {
             String enrollId = requestMap.get("enroll_id");  //需求报名表主键
             HwEnrollment hwEnrollment = hwEnrollmentService.getById(enrollId);
-            List<HwOrder> hwOrder=hwOrderService.findHwOrderByEnrollId(enrollId);
-            if(hwOrder.size()>0){
+            List<HwOrder> hwOrder = hwOrderService.findHwOrderByEnrollId(enrollId);
+            if (hwOrder.size() > 0) {
                 returnMap.put("success", "3001");
-            }else{
+            } else {
                 if (hwEnrollment != null) {
                     hwEnrollmentService.removeById(enrollId);
                 }