Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java

@@ -3,11 +3,15 @@ package com.glxp.api.controller.sync;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.entity.system.SyncDataBustypeEntity;
+import com.glxp.api.entity.system.SyncDataChangeBustypesEntity;
 import com.glxp.api.entity.system.SyncDataSetEntity;
 import com.glxp.api.http.sync.SpGetHttpClient;
+import com.glxp.api.req.basic.FilterBussinessTypeRequest;
+import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 import com.glxp.api.res.system.SyncDataSetResponse;
 import com.glxp.api.service.sync.SyncDataBustypeService;
 import com.glxp.api.service.sync.SyncDataChangeBustypeService;
@@ -23,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
@@ -110,4 +115,22 @@ public class SyncDataSetController {
         }
 
     }
+
+    @AuthRuleAnnotation("system/param/syncData/selectedToInBus")
+    @GetMapping("/system/param/syncData/selectedToInBus")
+    public BaseResponse filterselectedToInBus(SyncDataBustypeEntity syncDataBustypeEntity) {
+        syncDataBustypeEntity.setDirect(2);
+        List<SyncDataBustypeEntity> list = syncDataBustypeService.filterSelected(syncDataBustypeEntity);
+        PageInfo<SyncDataBustypeEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    @AuthRuleAnnotation("system/param/syncData/selectedBus")
+    @GetMapping("/system/param/syncData/selectedBus")
+    public BaseResponse filterselectedBus(SyncDataBustypeEntity syncDataBustypeEntity) {
+        syncDataBustypeEntity.setDirect(1);
+        List<SyncDataBustypeEntity> list = syncDataBustypeService.filterSelected(syncDataBustypeEntity);
+        PageInfo<SyncDataBustypeEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
 }

src/main/java/com/glxp/api/dao/sync/SyncDataBustypeDao.java

@@ -16,4 +16,6 @@ public interface SyncDataBustypeDao extends BaseMapper<SyncDataBustypeEntity> {
 
     void inserts(@Param("syncDataBustypeEntities") List<SyncDataBustypeEntity> syncDataBustypeEntities);
 
+    List<SyncDataBustypeEntity> filterSelected(SyncDataBustypeEntity syncDataBustypeEntity);
+
 }

src/main/java/com/glxp/api/dao/system/SyncDataChangeBustypesDao.java

@@ -3,5 +3,9 @@ package com.glxp.api.dao.system;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.system.SyncDataChangeBustypesEntity;
 
+import java.util.List;
+
 public interface SyncDataChangeBustypesDao extends BaseMapper<SyncDataChangeBustypesEntity> {
+
+    List<SyncDataChangeBustypesEntity> filterSelected(SyncDataChangeBustypesEntity syncDataChangeBustypesEntity);
 }

src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.sync;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.system.SyncDataBustypeEntity;
+import com.glxp.api.entity.system.SyncDataChangeBustypesEntity;
 
 import java.util.List;
 
@@ -19,4 +20,6 @@ public interface SyncDataBustypeService extends IService<SyncDataBustypeEntity>
 
     boolean isExits(List<SyncDataBustypeEntity> syncDataBustypeEntities, Integer direct);
 
+    List<SyncDataBustypeEntity> filterSelected(SyncDataBustypeEntity syncDataBustypeEntity);
+
 }

src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java

@@ -48,4 +48,9 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,
 //
         return false;
     }
+
+    @Override
+    public List<SyncDataBustypeEntity> filterSelected(SyncDataBustypeEntity syncDataBustypeEntity) {
+        return syncDataBustypeDao.filterSelected(syncDataBustypeEntity);
+    }
 }

src/main/java/com/glxp/api/service/sync/impl/SyncDataChangeBustypeServiceImpl.java

@@ -41,4 +41,6 @@ public class SyncDataChangeBustypeServiceImpl implements SyncDataChangeBustypeSe
             syncDataChangeBustypesEntities.forEach(item -> syncDataChangeBustypesDao.insert(item));
         }
     }
+
+
 }

src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml

@@ -20,4 +20,18 @@
              #{item.outChange}, #{item.orderStatus}, #{item.direct}, #{item.syncStatus}, #{item.syncChange})
         </foreach>
     </insert>
+
+    <select id="filterSelected" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity"
+            resultType="com.glxp.api.entity.system.SyncDataBustypeEntity">
+        SELECT*
+        FROM sync_data_bustypes
+        <where>
+            <if test="name != null and name != ''">
+                AND name like concat('%', #{name}, '%')
+            </if>
+            <if test="direct != null and direct != ''">
+                AND direct = #{direct}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -599,5 +599,6 @@ CREATE TABLE if not exists `io_destiny_process_detail`
 
 CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
 
-
+CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
+                         'varchar(255) ', 1);