Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -866,4 +866,10 @@ public class AMScontroller  extends BaseRESTfulController {
     RESTfulResult updateBalancePl(@RequestBody Map<String,Object> map) {
         return amsFeign.updateBalancePl(map);
     }
+
+    @ApiOperation("重导WMS")
+    @PostMapping("/addWMS")
+    RESTfulResult addWMS(@RequestBody Map<String,Object> map) {
+        return amsFeign.addWMS(map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -80,6 +80,8 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             if(personnelMap != null){
                 dataMap.putAll(personnelMap);
             }
+            //注册cid
+
             System.out.println(dataMap);
         }
         return resMap;
@@ -94,10 +96,14 @@ public class BackgroundProcessingController extends BaseRESTfulController {
             searchMap.put("userCode",dilAppCid.getUserCode());
             List<DilAppCid> mapList = dilAppCidMapper.selectByParameters(searchMap);
             if(mapList.size() > 0 && mapList.get(0) != null) {
+                mapList.get(0).setUpdateTime(new Date());
+                dilAppCidMapper.updateByPrimaryKeySelective(mapList.get(0));
                 return success();
             }
             dilAppCid.setPrimaryId(dilAppCidMapper.nextId());
             dilAppCid.setInsertTime(new Date());
+            dilAppCid.setUpdateTime(new Date());
+            mapList.get(0).setDeleted(0);
             dilAppCidMapper.insertSelective(dilAppCid);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -323,4 +323,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateBalancePl")
     RESTfulResult updateBalancePl(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/addWMS")
+    RESTfulResult addWMS(@RequestBody Map<String, Object> map);
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -160,7 +160,7 @@
 
             </where>
             <if test="noRow == null">
-                order by LENGTH(company_name)
+                order by rc.register_aptitudes,LENGTH(company_name)
             </if>
             )
             <where>
@@ -168,7 +168,6 @@
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
             </if>
             </where>
-            ORDER BY to_number("seqNo")
             FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -325,7 +324,7 @@
                 AND ALTERNATE_FIELDS1 = #{sourceFlag}
             </if>
         </where>
-        order by LENGTH(OPERATION_POINT_NAME)
+        order by alternate_fields3,LENGTH(OPERATION_POINT_NAME)
         FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
@@ -341,7 +340,7 @@
                 #{item}
             </foreach>
         </if>
-      )  order by LENGTH("OPERATION_POINT_NAME")
+      )  order by LENGTH("OPERATION_POINT_NAME") desc
     </select>
 
     <select id="getPersonnelByLike" resultType="java.util.Map">