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

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

@@ -330,7 +330,7 @@ public class AMScontroller  extends BaseRESTfulController {
     @PostMapping("/")
     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");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
             map.put("priceDate", priceDate);
         }

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

@@ -316,6 +316,86 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.getMaterialYieldList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
+    @ApiOperation(value = "获取物资产量列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getRmsBaseProductionCostList")
+    public Map<String, Object> getRmsBaseProductionCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize
+    ) {
+        return rmsFeign.getRmsBaseProductionCostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertRmsBaseProductionCost")
+    public Map<String, Object> insertRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertRmsBaseProductionCost(mapValue);
+    }
+
+    @PostMapping("/updateRmsBaseProductionCost")
+    public Map<String, Object> updateRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateRmsBaseProductionCost(mapValue);
+    }
+
+    @PostMapping("/deleteRmsBaseProductionCost")
+    public Map<String, Object> deleteRmsBaseProductionCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteRmsBaseProductionCost(mapValue);
+    }
+
+    @PostMapping("/getRmsBasePurchaseCostList")
+    public Map<String, Object> getRmsBasePurchaseCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                            Integer apiId,
+                                                            Integer pageNum,
+                                                            Integer pageSize
+    ) {
+        return rmsFeign.getRmsBasePurchaseCostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertRmsBasePurchaseCost")
+    public Map<String, Object> insertRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertRmsBasePurchaseCost(mapValue);
+    }
+
+    @PostMapping("/updateRmsBasePurchaseCost")
+    public Map<String, Object> updateRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateRmsBasePurchaseCost(mapValue);
+    }
+
+    @PostMapping("/deleteRmsBasePurchaseCost")
+    public Map<String, Object> deleteRmsBasePurchaseCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteRmsBasePurchaseCost(mapValue);
+    }
+
+    @PostMapping("/getRmsBaseSaleCostList")
+    public Map<String, Object> getRmsBaseSaleCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize
+    ) {
+        return rmsFeign.getRmsBaseSaleCostList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @PostMapping("/insertRmsBaseSaleCost")
+    public Map<String, Object> insertRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.insertRmsBaseSaleCost(mapValue);
+    }
+
+    @PostMapping("/updateRmsBaseSaleCost")
+    public Map<String, Object> updateRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateRmsBaseSaleCost(mapValue);
+    }
+
+    @PostMapping("/deleteRmsBaseSaleCost")
+    public Map<String, Object> deleteRmsBaseSaleCost(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.deleteRmsBaseSaleCost(mapValue);
+    }
+
     @PostMapping("/insertMaterialYield")
     public Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String, Object> mapValue) {
         return rmsFeign.insertMaterialYield(mapValue);

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

@@ -94,4 +94,14 @@ public class ReportController {
     Map<String, Object> getSaleFourLicenceReport(@RequestBody(required=false) HashMap<String,Object> mapValue){
         return reportFeign.getSaleFourLicenceReport(mapValue);
     }
+
+
+    @ApiOperation(value="承运商报表")
+    @PostMapping(value = "/getTransReportCarrier")
+    Map<String, Object> getTransReportCarrier(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize){
+        return reportFeign.getTransReportCarrier(mapValue,apiId,pageNum,pageSize);
+    }
 }

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

@@ -87,6 +87,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.updateAmsSalaryContrac(map);
     }
 
+    @ApiOperation(value = "修改车辆实绩")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/tmscomprehensiveresults/batchUpdate")
+    @LogAround(foreignKeys = {"resultId"}, foreignKeyTypes = {"计算公式"})
+    public Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.tmscomprehensiveresultsBatchUpdate((List)map.get("list"));
+    }
+
     @ApiOperation(value = "派发运输订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/dispatchOrder")

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

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

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

@@ -127,6 +127,52 @@ public interface RmsFeign {
                                         @RequestParam("apiId") Integer apiId,
                                         @RequestParam("pageNum") Integer pageNum,
                                         @RequestParam("pageSize") Integer pageSize);
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/getRmsBaseProductionCostList")
+    Map<String, Object> getRmsBaseProductionCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize);
+    //新增生产成本数据
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/insertRmsBaseProductionCost")
+    Map<String, Object> insertRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/updateRmsBaseProductionCost")
+    Map<String, Object> updateRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbaseproductioncosts/deleteRmsBaseProductionCost")
+    Map<String, Object> deleteRmsBaseProductionCost(@RequestBody(required = false) Map<String,Object> model);
+
+
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/getRmsBasePurchaseCostList")
+    Map<String, Object> getRmsBasePurchaseCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize);
+    //新增生产成本数据
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/insertRmsBasePurchaseCost")
+    Map<String, Object> insertRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/updateRmsBasePurchaseCost")
+    Map<String, Object> updateRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasepurchasecosts/deleteRmsBasePurchaseCost")
+    Map<String, Object> deleteRmsBasePurchaseCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/getRmsBaseSaleCostList")
+    Map<String, Object> getRmsBaseSaleCostList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
+    //新增生产成本数据
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/insertRmsBaseSaleCost")
+    Map<String, Object> insertRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/updateRmsBaseSaleCost")
+    Map<String, Object> updateRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+
+    @PostMapping(value = "api/v1/rms/rmsbasesalecosts/deleteRmsBaseSaleCost")
+    Map<String, Object> deleteRmsBaseSaleCost(@RequestBody(required = false) Map<String,Object> model);
+
     //新增物料产量
     @PostMapping(value = "api/v1/rms/rmsmaterialyields/insertMaterialYield")
     Map<String, Object> insertMaterialYield(@RequestBody(required = false) Map<String,Object> model);

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

@@ -35,6 +35,8 @@ public interface TmsFeign {
 
     @PostMapping("api/v1/tms/tmscomprehensiveresults/tmscomprehensiveresultsupdate")
     Map<String, Object> updateAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/tms/tmscomprehensiveresults/batchUpdate")
+    Map<String, Object> tmscomprehensiveresultsBatchUpdate(@RequestBody(required = false) List<Map<String, Object>> map);
 
     @PutMapping("api/v1/tms/tmscomprehensiveresults/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,stdout, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -37,6 +37,8 @@ log4j.appender.errorfile.Threshold = ERROR
 log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
 #log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
 log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.errorfile.MaxFileSize=100MB
+log4j.appender.errorfile.MaxBackupIndex=3
 
 ### 运行日志 ###
 log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
@@ -46,6 +48,8 @@ log4j.appender.RUNNING.Threshold = INFO
 log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+log4j.appender.RUNNING.MaxFileSize=100MB
+log4j.appender.RUNNING.MaxBackupIndex=3
 
 ### 指定类###
 log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB