修改

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 
@@ -27,4 +28,14 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
         List<HashMap> models = meterWorkDataCountService.countFirstAndActual(params);
         return success(models);
     }
+
+    @ApiOperation(value="检测检验中心生产运行日报", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/productionAndOperationDaily")
+    public RESTfulResult productionAndOperationDaily(@RequestBody(required = false) HashMap params) throws ParseException {
+        if(params.get("filterdate") == null || params.get("filterdate").toString().equals("")) {
+            return failed("日期不能为空！！");
+        }
+        HashMap models = meterWorkDataCountService.productionAndOperationDaily(params);
+        return success(models);
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.java

@@ -8,4 +8,5 @@ import java.util.List;
 @Mapper
 public interface MeterWorkDataCountMapper {
     List<HashMap> countFirstAndActual(HashMap<String, Object> param);
+    HashMap productionAndOperationDaily(HashMap<String, Object> param);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -102,4 +102,32 @@
         '吊钩秤' as remark
          from dual
     </select>
+
+    <select id="productionAndOperationDaily" parameterType="java.util.HashMap" resultType="hashmap">
+        select (select sum(net_weight)/1000 from meter_work_railway_actual A where A.railway_type_no = '001019002' and A.value_flag != '0' and A.meter_type_no = 'PO2GM'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>) dynamic_SendOutTms,
+            (select sum(net_weight)/1000 from meter_work_railway_actual A where A.railway_type_no = '001019001' and A.value_flag != '0' and A.meter_type_no = 'PO2GM'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>) static_PO2GM,
+            (select sum(net_weight)/1000 from meter_work_railway_actual A where A.railway_type_no = '001019001' and A.value_flag != '0' and A.meter_type_no = 'SendToOutTms'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>) static_SendToOutTms,
+            (select sum(net_weight)/1000 from meter_work_car_actual A where A.value_flag != '0' and A.meter_type_no = 'PO2GM'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>) Truck_PO2GM,
+            (select sum(net_weight)/1000 from meter_work_car_actual A where A.value_flag != '0'  and A.meter_type_no = 'SendToOutTms'
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>) Truck_SendToOutTms,
+            (select sum(net_weight)/1000 from meter_work_car_actual A where A.value_flag != '0'  and A.net_spot3_no in ('JT0020', 'JT0001','JT0031')
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>) Truck_Overall
+        from dual
+    </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -1,8 +1,10 @@
 package com.steerinfo.meterwork.meterworkdatacount.service;
 
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 
 public interface IMeterWorkDataCountService{
     List<HashMap> countFirstAndActual(HashMap<String, Object> params);
+    HashMap productionAndOperationDaily(HashMap<String, Object> params) throws ParseException;
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -1,10 +1,17 @@
 package com.steerinfo.meterwork.meterworkdatacount.service.impl;
 
+import com.ibm.wsdl.extensions.schema.SchemaImpl;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper;
 import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.validation.Payload;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -19,4 +26,22 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         List<HashMap> models = meterWorkDataCountMapper.countFirstAndActual(params);
         return models;
     }
+
+    @Override
+    public HashMap productionAndOperationDaily(HashMap<String, Object> params) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
+        SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
+        String dateStr = params.get("filterdate").toString().substring(0, 10);
+        String[] str = dateStr.split("-");
+        params.put("startTime", dateStr + " 00:00:00");
+        params.put("endTime", dateStr + " 23:59:59");
+        HashMap models = meterWorkDataCountMapper.productionAndOperationDaily(params);
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getUserCode();
+        String userName = payload.getUserName();
+        models.put("userId", userId);
+        models.put("userName", userName);
+        models.put("myDate", str[0] + '年' + str[1] + '月'+ str[2] + '日');
+        return models;
+    }
 }