Merge remote-tracking branch 'origin/dev_2.5_mutiscan' into dev_2.5_mutiscan

src/main/java/com/glxp/api/controller/collect/IoCollectErrorLogController.java

@@ -0,0 +1,39 @@
+package com.glxp.api.controller.collect;
+
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.req.collect.IoCollectErrorLogRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.collect.IoCollectErrorLogResponse;
+import com.glxp.api.service.collect.IoCollectErrorLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class IoCollectErrorLogController extends BaseController {
+
+    @Resource
+    private IoCollectErrorLogService ioCollectErrorLogService;
+
+
+    @GetMapping("/udiwms/ioCollectErrorLog/filter")
+    public BaseResponse list(IoCollectErrorLogRequest request, BindingResult bindingResult) {
+        List<IoCollectErrorLogResponse> relCodeDetailResponses = ioCollectErrorLogService.filterList(request);
+        PageInfo<IoCollectErrorLogResponse> pageInfo = new PageInfo<>(relCodeDetailResponses);
+        PageSimpleResponse<IoCollectErrorLogResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(relCodeDetailResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+}

src/main/java/com/glxp/api/dao/collect/IoCollectErrorLogMapper.java

@@ -2,8 +2,13 @@ package com.glxp.api.dao.collect;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.collect.IoCollectErrorLog;
+import com.glxp.api.req.collect.IoCollectErrorLogRequest;
+import com.glxp.api.res.collect.IoCollectErrorLogResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface IoCollectErrorLogMapper extends BaseMapperPlus<IoCollectErrorLogMapper, IoCollectErrorLog, IoCollectErrorLog> {
-}
+    List<IoCollectErrorLogResponse> filterList(IoCollectErrorLogRequest request);
+}

src/main/java/com/glxp/api/entity/collect/IoCollectErrorLog.java

@@ -59,7 +59,7 @@ public class IoCollectErrorLog implements Serializable {
      * 更新人
      */
     @TableField(value = "updateUser")
-    private Date updateUser;
+    private String updateUser;
 
     /**
      * 备注
@@ -68,4 +68,4 @@ public class IoCollectErrorLog implements Serializable {
     private String remark;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/glxp/api/req/collect/IoCollectErrorLogRequest.java

@@ -0,0 +1,36 @@
+package com.glxp.api.req.collect;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+
+@Data
+public class IoCollectErrorLogRequest extends ListPageRequest {
+
+    /**
+     * 单据号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
+    /**
+     * 自动赋码
+     */
+    @TableField(value = "autoCode")
+    private String autoCode;
+
+    /**
+     * 手动赋码
+     */
+    @TableField(value = "manuCode")
+    private String manuCode;
+
+    /**
+     * 错误类型：1：未上传医保替换码；2：已上传替换码,3:退货未上传替换码;4:退货已上传替换码
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+
+}

src/main/java/com/glxp/api/res/collect/IoCollectErrorLogResponse.java

@@ -0,0 +1,58 @@
+package com.glxp.api.res.collect;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class IoCollectErrorLogResponse {
+
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 单据号
+     */
+    @TableField(value = "orderId")
+    private String orderId;
+
+    /**
+     * 自动赋码
+     */
+    @TableField(value = "autoCode")
+    private String autoCode;
+
+    /**
+     * 手动赋码
+     */
+    @TableField(value = "manuCode")
+    private String manuCode;
+
+    /**
+     * 错误类型：1：未上传医保替换码；2：已上传替换码,3:退货未上传替换码;4:退货已上传替换码
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+}

src/main/java/com/glxp/api/service/collect/IoCollectErrorLogService.java

@@ -1,7 +1,11 @@
 package com.glxp.api.service.collect;
 
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.req.collect.IoCollectErrorLogRequest;
+import com.glxp.api.res.collect.IoCollectErrorLogResponse;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.collect.IoCollectErrorLogMapper;
@@ -9,4 +13,14 @@ import com.glxp.api.entity.collect.IoCollectErrorLog;
 @Service
 public class IoCollectErrorLogService extends ServiceImpl<IoCollectErrorLogMapper, IoCollectErrorLog> {
 
+    public List<IoCollectErrorLogResponse> filterList(IoCollectErrorLogRequest request) {
+        if (request == null) {
+            return Collections.emptyList();
+        }
+        if (request.getPage() != null) {
+            int offset = (request.getPage() - 1) * request.getLimit();
+            PageHelper.offsetPage(offset, request.getLimit());
+        }
+        return this.baseMapper.filterList(request);
+    }
 }

src/main/resources/mybatis/mapper/collect/IoCollectErrorLogMapper.xml

@@ -17,4 +17,19 @@
     <!--@mbg.generated-->
     id, orderId, autoCode, manuCode, `type`, updateTime, updateUser, remark
   </sql>
-</mapper>
+
+
+  <select id="filterList" parameterType="com.glxp.api.req.collect.IoCollectErrorLogRequest"
+          resultType="com.glxp.api.res.collect.IoCollectErrorLogResponse">
+    select  *
+    from io_collect_error_log icel
+    <where>
+      <if test="orderId != '' and orderId != null">
+        AND icel.orderId LIKE concat(#{orderId}, '%')
+      </if>
+      <if test="type != null">
+        AND icel.type = #{type}
+      </if>
+    </where>
+  </select>
+</mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -5525,7 +5525,7 @@ CREATE TABLE IF NOT EXISTS `io_collect_error_log`
     `manuCode`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '手动赋码',
     `type`       int                                                           NULL DEFAULT NULL COMMENT '错误类型：1：未上传医保替换码；2：已上传替换码',
     `updateTime` datetime                                                      NULL DEFAULT NULL COMMENT '更新时间',
-    `updateUser` datetime                                                      NULL DEFAULT NULL COMMENT '更新人',
+    `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
     `remark`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB