展示原来的任务完成凭证图片

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -234,6 +234,14 @@ public class RequirementsController extends BaseController {
     public ResultBody updateTaskUrl(@RequestBody UpdateTaskUrlVO updateTaskUrlVO) {
         return requirementsService.updateTaskUrl(updateTaskUrlVO.getTaskUrl(),updateTaskUrlVO.getRequirementsInfoId());
     }
+
+    @ApiOperation(value = "查看原来图片凭证")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getTaskUrl")
+    public ResultBody getTaskUrl(@ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
+        return requirementsService.getTaskUrl(requirementsInfoId);
+    }
+
     @ApiOperation(value = "new——小程序-—发布者--订单结算")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("settleAccounts")

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -126,6 +126,7 @@ public interface RequirementsDao {
 
     void updateTaskUrl(@Param("taskUrl") String taskUrl,@Param("requirementsInfoId") Integer requirementsInfoId);
 
+    String getTaskUrl(Integer requirementsInfoId);
     ServiceFulfilATaskDO fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
 
     void settleAccounts(ServiceSettleAccountsDO settleAccountsDO);

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -90,6 +90,7 @@ public interface RequirementsService {
 
     ResultBody updateTaskUrl(String taskUrl,Integer requirementsInfoId);
 
+    ResultBody getTaskUrl(Integer requirementsInfoId);
     ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
 
     ResultBody settleAccounts(ServiceSettleAccountsVO settleAccountsVO, HttpServletRequest request);

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -3177,33 +3177,38 @@ public class RequirementsServiceImpl implements RequirementsService {
             return ResultBody.error("没有查到这个订单");
         }
 
-        String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
-        if(StringUtils.isEmpty(taskUrl1)){
-            String newTaskUrl = taskUrl;
-            requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
-            return ResultBody.success();
-        }
-        taskUrl = taskUrl.replace("\\","");
-        // 解析为JSON数组
-        JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
-        JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
-
-        // 合并JSON数组
-        JsonArray mergedArray = new JsonArray();
-        for (int i = 0; i < jsonArray1.size(); i++) {
-            mergedArray.add(jsonArray1.get(i));
-        }
-        for (int i = 0; i < jsonArray2.size(); i++) {
-            mergedArray.add(jsonArray2.get(i));
-        }
-
-        // 转换为字符串形式
-        String newTaskUrl = mergedArray.toString();
-        requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
+//        String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
+//        if(StringUtils.isEmpty(taskUrl1)){
+//            String newTaskUrl = taskUrl;
+//            requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
+//            return ResultBody.success();
+//        }
+//        taskUrl = taskUrl.replace("\\","");
+//        // 解析为JSON数组
+//        JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
+//        JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
+//
+//        // 合并JSON数组
+//        JsonArray mergedArray = new JsonArray();
+//        for (int i = 0; i < jsonArray1.size(); i++) {
+//            mergedArray.add(jsonArray1.get(i));
+//        }
+//        for (int i = 0; i < jsonArray2.size(); i++) {
+//            mergedArray.add(jsonArray2.get(i));
+//        }
+//
+//        // 转换为字符串形式
+//        String newTaskUrl = mergedArray.toString();
+        requirementsDao.updateTaskUrl(taskUrl,requirementsInfoId);
         return ResultBody.success();
     }
 
     @Override
+    public ResultBody getTaskUrl(Integer requirementsInfoId) {
+        return ResultBody.success(requirementsDao.getTaskUrl(requirementsInfoId));
+    }
+
+    @Override
     public ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId) {
         ServiceFulfilATaskDO serviceFulfilATaskDO = requirementsDao.fulfilATaskDetails(requirementsInfoId, userAccountId);
         ServiceFulfilATaskDTO serviceFulfilATaskDTO = serviceFulfilATaskDO.buildServiceFulfilATaskDTO();

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1702,6 +1702,11 @@
         where requirements_info_id = #{requirementsInfoId}
     </update>
 
+    <select id="getTaskUrl" resultType="java.lang.String">
+        select task_url from service_fulfil_a_task
+        where requirements_info_id = #{requirementsInfoId}
+    </select>
+
     <insert id="insertAgreePilotOrder">
         insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
         values(#{requireInfoId},#{serviceFlowId},#{pilotCertificationUserId},NOW())
@@ -2197,6 +2202,7 @@
         WHERE ri.user_account_id = #{userAccountId}
             AND ri.id = #{requirementsInfoId}
     </select>
+
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>