hxl13994548489 2 жил өмнө
parent
commit
706d7dc403

+ 2 - 5
src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -81,15 +81,12 @@ public class SysUserAccountController extends BaseController {
      */
     @GetMapping("getSubOrderDetails")
     @ApiOperation("获取订单详情")
-    public HttpResult<SubOrder>  getSubOrderDetails(String subOrderId,String userId){
+    public HttpResult<SubOrder>  getSubOrderDetails(String subOrderId){
         if(StringUtils.isBlank(subOrderId)){
             return HttpResult.error("订单号subOrderId不能为空");
         }
-        if(StringUtils.isBlank(userId)){
-            return HttpResult.error("用户编码userId不能为空");
-        }
         try{
-            SubOrder subOrder =sysUserAccountService.getSubOrderDetails(subOrderId,userId);
+            SubOrder subOrder =sysUserAccountService.getSubOrderDetails(subOrderId,BaseController.getUser().getId());
             return  HttpResult.ok("success", subOrder);
         }catch (Exception e){
             return HttpResult.error("操作失败"+e.getMessage());

+ 3 - 3
src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -422,7 +422,7 @@
                         AND DATE_FORMAT(iac.signing_time, '%Y-%m' ) = #{timeFiltering}
                     </when>
                     <otherwise>
-                        AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d' ) = #{timeFiltering}
+                        AND DATE_FORMAT(iac.signing_time, '%Y-%m' ) = #{timeFiltering}
                     </otherwise>
                 </choose>
             </if>
@@ -459,7 +459,7 @@
                         AND DATE_FORMAT(iac.signing_time, '%Y-%m' ) = #{timeFiltering}
                     </when>
                     <otherwise>
-                        AND DATE_FORMAT(iac.signing_time, '%Y-%m-%d' ) = #{timeFiltering}
+                        AND DATE_FORMAT(iac.signing_time, '%Y-%m' ) = #{timeFiltering}
                     </otherwise>
                 </choose>
             </if>
@@ -498,7 +498,7 @@
                         AND DATE_FORMAT(ins.signing_time, '%Y-%m' ) = #{timeFiltering}
                     </when>
                     <otherwise>
-                        AND DATE_FORMAT(ins.signing_time, '%Y-%m-%d' ) = #{timeFiltering}
+                        AND DATE_FORMAT(ins.signing_time, '%Y-%m' ) = #{timeFiltering}
                     </otherwise>
                 </choose>
             </if>