1

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

@@ -137,4 +137,10 @@ public class ReportController {
                                    Integer pageSize) {
         return reportFeign.selecttype1(mapValue, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value="每日汇总")
+    @PostMapping(value = "/dailySummary")
+    Map<String, Object> dailySummary(@RequestBody(required=false) Map<String,Object> params) {
+        return reportFeign.dailySummary(params);
+    }
 }

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

@@ -113,6 +113,14 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查作业点")
+    @PostMapping("/getOperationPointByLikeNoCode")
+    public RESTfulResult getOperationPointByLikeNoCode(@RequestBody(required = false) Map<String,Object> map) {
+        //System.out.println(map.get("id"));
+        List<Map<String, Object>> list = universalMapper.getOperationPointByLikeNoCode(map);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "边输边查人员")
     @PostMapping("/getPersonnelByLike")
     public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String,Object> map) {

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

@@ -69,4 +69,7 @@ public interface ReportFeign {
                                    @RequestParam Integer apiId,
                                    @RequestParam  Integer pageNum,
                                    @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/dailySummary/dailySummary")
+    Map<String, Object> dailySummary(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -32,6 +32,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getOperationPointByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getOperationPointByLikeNoCode(Map<String, Object> map);
+
     List<Map<String, Object>> getCategoryCodeByLike(Map<String, Object> map);
 
 

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

@@ -355,6 +355,60 @@
       )  order by "f3", LENGTH("OPERATION_POINT_NAME") desc
     </select>
 
+
+    <select id="getOperationPointByLikeNoCode" resultType="java.util.Map">
+        select * from (
+        SELECT * FROM (
+        select
+        OPERATION_POINT_ID "id",
+        OPERATION_POINT_ID "value",
+        OPERATION_POINT_NAME "OPERATION_POINT_NAME",
+        OPERATION_POINT_NAME "label",
+        OPERATION_POINT_NAME "text",
+        OPERATION_POINT_CODE "code",
+        REMARK "remark",
+        alternate_fields3 "f3"
+        from RMS_OPERATION_POINT
+        <where>
+            DELETED = 0
+            <if test="operationPointType!=null and operationPointType!=''">
+                AND REGEXP_LIKE(OPERATION_POINT_TYPE, #{operationPointType})
+            </if>
+            <if test="receivingPointId!=null and receivingPointId!=''">
+                AND OPERATION_POINT_ID = #{receivingPointId}
+            </if>
+            <if test="shippingPointId!=null and shippingPointId!=''">
+                AND OPERATION_POINT_ID =  #{shippingPointId}
+            </if>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(OPERATION_POINT_CODE || OPERATION_POINT_NAME, #{index})
+            </if>
+            <if test="sourceFlag != null and sourceFlag !=''">
+                AND ALTERNATE_FIELDS1 = #{sourceFlag}
+            </if>
+        </where>
+        order by alternate_fields3,LENGTH(OPERATION_POINT_NAME)
+        FETCH NEXT 50 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
+            UNION select
+            OPERATION_POINT_ID "id",
+            OPERATION_POINT_ID "value",
+            OPERATION_POINT_NAME "OPERATION_POINT_NAME",
+            OPERATION_POINT_NAME "label",
+            OPERATION_POINT_NAME "text",
+            OPERATION_POINT_CODE "code",
+            REMARK "remark",
+            alternate_fields3 "f3"
+            from RMS_OPERATION_POINT
+            where
+            <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                REGEXP_LIKE(OPERATION_POINT_NAME, #{item})
+            </foreach>
+        </if>
+        )  order by "f3", LENGTH("OPERATION_POINT_NAME") desc
+    </select>
+
     <select id="getPersonnelByLike" resultType="java.util.Map">
     select * from (
     select * from (