Redeem vor 1 Jahr
Ursprung
Commit
afa2d87294

+ 2 - 10
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -67,16 +67,8 @@ public class TMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
     @PostMapping("/addcomprehensiveresults")
-    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
-        if (!map.isEmpty()) {
-            if (!map.get("resultTime").toString().isEmpty()) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                Date resultTime = simpleDateFormat.parse(map.get("resultTime").toString());
-                map.put("resultTime", resultTime);
-            }
-        }
-        map.put("insertUsername", map.get("userName").toString());
-        return tmsFeign.insertAmsSalaryContrac(map);
+    public Map<String, Object> insertcomprehensiveresults(@RequestBody(required = false) Map<String, Object> map)  {
+        return tmsFeign.addComprehensiveResult(map);
     }
 
     @ApiOperation(value = "车辆实绩删除")

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -31,7 +31,7 @@ public interface TmsFeign {
                                                 @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/add")
-    Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> addComprehensiveResult(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
     Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);

+ 4 - 4
src/main/resources/application-prod.yml

@@ -29,13 +29,13 @@ openfeign:
     url: ${AMSFEIGN_URL:172.16.90.202:8000}
 #    url: ${RMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${RMSFEIGN_URL:localhost:8086}
+#    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${RMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8000}
   RmsFeign:
-#    url: ${RMSFEIGN_URL:172.16.90.202:8000}
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:8000}
+#    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
     url: ${EMSFEIGN_URL:172.16.90.202:8000}
   SSOFeign: