单据配置相关修改

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

@@ -0,0 +1,49 @@
+package com.glxp.api.controller.collect;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.entity.collect.IoCollectSet;
+import com.glxp.api.req.collect.CollectOrderCodeManRequest;
+import com.glxp.api.req.inout.AddTagCodeReqeust;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.collect.CollectOrderCodeManResponse;
+import com.glxp.api.service.collect.IoCollectSetService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class IoCollectSetController extends BaseController {
+
+    @Resource
+    IoCollectSetService collectSetService;
+
+
+
+    @GetMapping("/udiwms/ioSplit/collect/getSet")
+    public BaseResponse getSet() {
+        List<IoCollectSet> collectSets = collectSetService.list();
+        return ResultVOUtils.success(collectSets.get(0));
+    }
+
+
+
+    @PostMapping("/udiwms/ioSplit/collect/updateSet")
+    public BaseResponse updateSet(@RequestBody @Valid IoCollectSet collectSet) {
+        collectSetService.updateById(collectSet);
+        return ResultVOUtils.success("修改成功！");
+    }
+}

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

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.collect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.collect.IoCollectSet;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoCollectSetMapper extends BaseMapper<IoCollectSet> {
+}

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

@@ -0,0 +1,67 @@
+package com.glxp.api.entity.collect;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+
+@ApiModel(value = "io_collect_set")
+@Data
+@TableName(value = "io_collect_set")
+public class IoCollectSet implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 开启下载下时间
+     */
+    @TableField(value = "startDownloadTime")
+    @ApiModelProperty(value = "开启下载下时间")
+    private Date startDownloadTime;
+
+    /**
+     * 是否开启自动下载
+     */
+    @TableField(value = "autoDownload")
+    @ApiModelProperty(value = "是否开启自动下载")
+    private Boolean autoDownload;
+
+    /**
+     * 是否自动转成待处理单
+     */
+    @TableField(value = "autoDealOrder")
+    @ApiModelProperty(value = "是否自动转成待处理单")
+    private Boolean autoDealOrder;
+
+    /**
+     * 是否自动分配单据
+     */
+    @TableField(value = "autoAllotOrder")
+    @ApiModelProperty(value = "是否自动分配单据")
+    private Boolean autoAllotOrder;
+
+    /**
+     * 是否自动完成单据
+     */
+    @TableField(value = "autoFinishOrder")
+    @ApiModelProperty(value = "是否自动完成单据")
+    private Boolean autoFinishOrder;
+
+
+    /**
+     * 是否自动上传已完成单据
+     */
+    @TableField(value = "autoUploadOrder")
+    @ApiModelProperty(value = "是否自动上传已完成单据")
+    private Boolean autoUploadOrder;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -49,7 +49,6 @@ import java.util.List;
 @Service
 public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBackupMapper, IoCollectOrderBackup> {
 
-
     @Resource
     IoCollectOrderBackupMapper ioCollectOrderBackupMapper;
     @Resource

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

@@ -157,7 +157,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         if (collectOrderRequest == null) {
             return Collections.emptyList();
         }
-        if (collectOrderRequest.getPage() != null) {
+        if (collectOrderRequest.getPage() != null  && collectOrderRequest.getLimit()!=null) {
             int offset = (collectOrderRequest.getPage() - 1) * collectOrderRequest.getLimit();
             PageHelper.offsetPage(offset, collectOrderRequest.getLimit());
         }

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

@@ -0,0 +1,12 @@
+package com.glxp.api.service.collect;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.collect.IoCollectSet;
+import com.glxp.api.dao.collect.IoCollectSetMapper;
+@Service
+public class IoCollectSetService extends ServiceImpl<IoCollectSetMapper, IoCollectSet> {
+
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.collect.IoCollectSetMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.collect.IoCollectSet">
+    <!--@mbg.generated-->
+    <!--@Table io_collect_set-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="startDownloadTime" jdbcType="TIMESTAMP" property="startDownloadTime" />
+    <result column="autoDownload" jdbcType="TINYINT" property="autoDownload" />
+    <result column="autoDealOrder" jdbcType="TINYINT" property="autoDealOrder" />
+    <result column="autoAllotOrder" jdbcType="TINYINT" property="autoAllotOrder" />
+    <result column="autoFinishOrder" jdbcType="TINYINT" property="autoFinishOrder" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, startDownloadTime, autoDownload, autoDealOrder, autoAllotOrder, autoFinishOrder
+  </sql>
+</mapper>