修改

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

@@ -336,15 +336,14 @@ public class AMScontroller  extends BaseRESTfulController {
     @ApiOperation(value = "新增承运合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
-    @PostMapping("/")
+    @PostMapping("/addAmsTransPrice")
     public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         if (map.containsKey("priceDate")){
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
             map.put("priceDate", priceDate);
         }
-
-        return amsFeign.add(map);
+        return amsFeign.addAmsTransPrice(map);
     }
 
     @ApiOperation(value = "修改承运合同")

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

@@ -143,4 +143,13 @@ public class ReportController {
     Map<String, Object> dailySummary(@RequestBody(required=false) Map<String,Object> params) {
         return reportFeign.dailySummary(params);
     }
+
+    @ApiOperation(value="职工考勤数据管理")
+    @PostMapping(value = "/staffAttendanceList")
+    Map<String, Object> staffAttendanceList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize) {
+        return reportFeign.staffAttendanceList(mapValue, apiId, pageNum, pageSize);
+    }
 }

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

@@ -198,11 +198,18 @@ public class TMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/startend")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计时"})
-    @RequestLimit
     public Map<String, Object> start(@RequestBody(required = false) Map<String, Object> map) {
         return tmsFeign.startend(map);
     }
 
+
+    @ApiOperation(value="计时")
+    @PostMapping(value = "/updCountResult")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"计次"})
+    public Map<String, Object> updCountResult(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.updCountResult(map);
+    }
+
     @ApiOperation(value = "查询计时")
     @PostMapping("/tmstimingresultsList")
     public Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
@@ -962,7 +969,18 @@ public class TMSController extends BaseRESTfulController {
         map.put("list", list);
         map.put("userId", userId);
         map.put("userName", userName);
-        map.put("resultType",resultType);
+        map.put("resultType", resultType);
         return tmsFeign.importComprehensiveResult(map);
     }
+    @ApiOperation(value = "火运大宗销售订单 删除销售运输订单")
+    @PostMapping("/changeTransOrderH")
+    public Map<String,Object> changeTransOrderH(@RequestBody Map<String,Object> map) {
+        return tmsFeign.changeTransOrderH(map);
+    }
+
+    @ApiOperation(value = "火运出库后修改车号")
+    @PostMapping("/updateCarNo")
+    public Map<String,Object> updateCarNo(@RequestBody Map<String,Object> map) {
+        return tmsFeign.updateCarNo(map);
+    }
 }

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

@@ -117,8 +117,8 @@ public interface AmsFeign {
                              @RequestParam Integer pageNum,
                              @RequestParam Integer pageSize);
 
-    @PostMapping("api/v1/ams/amstransprices/")
-    Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/ams/amstransprices/addAmsTransPrice")
+    Map<String, Object> addAmsTransPrice(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amstransprices/{id}")
     Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);

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

@@ -72,4 +72,10 @@ public interface ReportFeign {
 
     @PostMapping(value = "api/v1/report/dailySummary/dailySummary")
     Map<String, Object> dailySummary(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/report/productReports/staffAttendanceList")
+    Map<String, Object> staffAttendanceList(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam  Integer pageNum,
+                                            @RequestParam  Integer pageSize);
 }

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

@@ -722,7 +722,7 @@ public interface RmsFeign {
                                          @RequestParam Integer pageNum,
                                          @RequestParam Integer pageSize);
 
-    @PostMapping("api/v1/rms/rmsextractscales/add")
+    @PostMapping("api/v1/rms/rmsextractscales/addRmsExtractScale")
     Map<String, Object> addExtractscale(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsextractscales/logicdelete")

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

@@ -82,6 +82,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/tmstimingresults/startend")
     Map<String, Object> startend(Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/tmstimingresults/updCountResult")
+    Map<String, Object> updCountResult(Map<String, Object> map);
+
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsUpdate")
     Map<String, Object> tmstimingresultsUpdate(Map<String, Object> map);
 
@@ -335,6 +338,13 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/tmscomprehensiveresults/importComprehensiveResult")
     Map<String, Object> importComprehensiveResult(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/changeTransOrderH")
+    Map<String, Object> changeTransOrderH(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/omstransorders/updateCarNo")
+    Map<String, Object> updateCarNo(Map<String, Object> map);
+
 }
 
 

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

@@ -659,7 +659,7 @@
         select * from (
         select * from (
         select * from (
-        select rownum id,t.* from (
+        select rownum rowno,t.* from (
         SELECT DISTINCT
         RCA .CAPACITY_ID "capacityId",
         RCA .CAPACITY_ID "id",
@@ -770,7 +770,7 @@
         <if test="id!=null and id.size>0">
             UNION
             SELECT DISTINCT
-            0 id,
+            0 rowno,
             RCA .CAPACITY_ID "capacityId",
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",