fix 搜索错误

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReplacementPayDto.java

@@ -0,0 +1,43 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class ReplacementPayDto {
+    @ApiModelProperty(value = "调查id", required = true)
+    private Integer id;
+
+    @ApiModelProperty(value = "支付金额", required = true)
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "是否使用余额", required = true)
+    private Boolean isUseBalance = false;
+
+    @ApiModelProperty(value = "重新支付", required = true)
+    private Boolean isRePay = false;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public Boolean getUseBalance() {
+        return isUseBalance;
+    }
+
+    public void setUseBalance(Boolean useBalance) {
+        isUseBalance = useBalance;
+    }
+}

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentCooperationMapper.xml

@@ -61,8 +61,8 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ReplacementInstrumentCooperation" parameterType="map">
         SELECT ric.*,o.name_ organName,co.name_ cooperationOrganName FROM replacement_instrument_cooperation ric
-        LEFT JOIN cooperation_organ co on ric.cooperation_organ_id_ = co.id_
-        LEFT JOIN organization o on o.id_ = ric.organ_id_
+        LEFT JOIN cooperation_organ co ON co.id_ = ric.cooperation_organ_id_
+        LEFT JOIN organization o ON o.id_ = ric.organ_id_
         <include refid="queryPageSql"/>
         ORDER BY ric.id_ DESC
         <include refid="global.limit"/>
@@ -84,6 +84,7 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
         SELECT COUNT(*) FROM replacement_instrument_cooperation ric
+        LEFT JOIN cooperation_organ co ON co.id_ = ric.cooperation_organ_id_
         <include refid="queryPageSql"/>
     </select>
 

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -2,6 +2,7 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.ReplacementPayDto;
 import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
 import com.ym.mec.biz.dal.entity.Student;
@@ -9,8 +10,11 @@ import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
 import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +95,10 @@ public class ReplacementInstrumentActivityController extends BaseController {
         }
         return succeed(replacementInstrumentActivityService.get(id));
     }
-}
+
+    @ApiOperation(value = "置换支付")
+    @PostMapping("/pay")
+    @ApiImplicitParams({@ApiImplicitParam(name = "replacementPayDto", value = "支付参数", required = true, dataType = "ReplacementPayDto")})
+    public HttpResponseResult pay(ReplacementPayDto replacementPayDto) throws Exception {
+        return succeed(studentInstrumentService.pay(maintenancePayDto));
+    }