生产数据

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/controller/ProductionDataController.java

@@ -2,15 +2,18 @@ package cn.com.victorysoft.business.cyyzs.controller;
 
 import cn.com.victorysoft.business.cyyzs.entity.ProductionData;
 import cn.com.victorysoft.business.cyyzs.entity.StaticData;
+import cn.com.victorysoft.business.cyyzs.param.ProductionExport;
+import cn.com.victorysoft.business.cyyzs.param.ProductionParam;
 import cn.com.victorysoft.business.cyyzs.param.StaticDataParam;
 import cn.com.victorysoft.business.cyyzs.service.ProductionDataService;
+import cn.com.victorysoft.business.sys.entity.ExportResult;
+import cn.com.victorysoft.business.sys.param.UnitMonthExportParam;
+import cn.com.victorysoft.business.util.ExcelUtils;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -27,7 +30,15 @@ public class ProductionDataController {
     private ProductionDataService productionDataService;
 
     @GetMapping()
-    public List<ProductionData> selectList(String yclx, String dwdm, String dydm, String ksrq, String jsrq) {
-        return productionDataService.selectList(yclx, dwdm, dydm, ksrq, jsrq);
+    public List<ProductionData> selectList(ProductionParam param) {
+        return productionDataService.selectList(param);
     }
+
+    @PostMapping("/productionExport")
+    @ApiOperation("导出本单位及字段数据")
+    public ExportResult productionExport(@RequestBody ProductionExport param){
+        List<ProductionData> list = this.selectList(param);
+        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
+    }
+
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/dao/ProductionDataDao.java

@@ -3,6 +3,7 @@ package cn.com.victorysoft.business.cyyzs.dao;
 
 import cn.com.victorysoft.business.cyyzs.entity.ProductionData;
 import cn.com.victorysoft.business.cyyzs.entity.StaticData;
+import cn.com.victorysoft.business.cyyzs.param.ProductionParam;
 import cn.com.victorysoft.business.cyyzs.param.StaticDataParam;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -14,13 +15,5 @@ import java.util.List;
 @Repository
 public interface ProductionDataDao {
 
-    /**
-     *
-     * @param yclx
-     * @param dwdm
-     * @param dydm
-     * @param ksrq
-     * @param jsrq
-     */
-    List<ProductionData> selectList(@Param("yclx") String yclx, @Param("dwdm") String dwdm, @Param("dydm") String dydm, @Param("ksrq") String ksrq, @Param("jsrq") String jsrq);
+    List<ProductionData> selectList(ProductionParam param);
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/param/ProductionExport.java

@@ -0,0 +1,18 @@
+package cn.com.victorysoft.business.cyyzs.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.sf.json.JSONArray;
+
+@ApiModel("生产数据导出")
+@Data
+public class ProductionExport extends ProductionParam{
+
+    @ApiModelProperty("文件名称")
+    private String fileName = "导出文件";
+
+    @ApiModelProperty("导出表头")
+    private JSONArray columnConfig;
+
+}

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/param/ProductionParam.java

@@ -0,0 +1,27 @@
+package cn.com.victorysoft.business.cyyzs.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.sf.json.JSONArray;
+
+@ApiModel("生产数据参数")
+@Data
+public class ProductionParam {
+
+    @ApiModelProperty("油藏类型")
+    private String yclx;
+
+    @ApiModelProperty("单位代码")
+    private String dwdm;
+
+    @ApiModelProperty("单元代码")
+    private String dydm;
+
+    @ApiModelProperty("开始日起")
+    private String ksrq;
+
+    @ApiModelProperty("结束日期")
+    private String jsrq;
+
+}

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/service/ProductionDataService.java

@@ -3,6 +3,7 @@ package cn.com.victorysoft.business.cyyzs.service;
 import cn.com.victorysoft.business.cyyzs.dao.ProductionDataDao;
 import cn.com.victorysoft.business.cyyzs.entity.ProductionData;
 import cn.com.victorysoft.business.cyyzs.entity.StaticData;
+import cn.com.victorysoft.business.cyyzs.param.ProductionParam;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@ public class ProductionDataService {
     private ProductionDataDao productionDataDao;
 
 
-    public List<ProductionData> selectList(String yclx, String dwdm, String dydm, String ksrq, String jsrq) {
-        return productionDataDao.selectList(yclx, dwdm, dydm, ksrq, jsrq);
+    public List<ProductionData> selectList(ProductionParam param) {
+        return productionDataDao.selectList(param);
     }
 }

vseaf4.4-cyyzs/src/main/resources/mapper/ProductionDataDao.xml

@@ -3,13 +3,14 @@
 <mapper namespace="cn.com.victorysoft.business.cyyzs.dao.ProductionDataDao">
 
 
-    <select id="selectList" resultType="cn.com.victorysoft.business.cyyzs.entity.ProductionData">
+    <select id="selectList" resultType="cn.com.victorysoft.business.cyyzs.entity.ProductionData"
+            parameterType="cn.com.victorysoft.business.cyyzs.param.ProductionParam">
         SELECT
             B.GYLX, COUNT(1) ZJS,
             SUM(CASE WHEN KCS >= 1 THEN 1 ELSE 0 END) KJS,
             SUM(ZCS) ZCS, SUM(KCS) KCS,
             SUM(CASE WHEN IS_JCJ >= 1 THEN 1 ELSE 0 END) JCJS,
-            SUM(JCCS) JCCS, SUM(HGC) HGC, SUM(CZC) CZC, SUM(QZC) QZC, SUM(BQC) BQC
+            SUM(JCCS) JCCS, SUM(HGC) HGC, SUM(CZC) CZC, SUM(QZC) QZC, SUM(BQC) BQC, ROUND((SUM(HGC)/SUM(JCCS)), 2) HGL
         FROM
             (
             SELECT
@@ -65,7 +66,7 @@
                                 <if test="ksrq != null and ksrq != ''"> AND A.RECORD_DATE >= TO_DATE(#{ksrq}, 'yyyy-mm-dd')</if>
                                 <if test="jsrq != null and jsrq != ''"> AND A.RECORD_DATE <![CDATA[ <= ]]> TO_DATE(#{jsrq}, 'yyyy-mm-dd')</if>
                                 <if test="dydm != null and dydm != ''"> AND A.QKDM = #{dydm}</if>
-                                <if test="dwdm != null and dwdm != ''"> AND A.DWDM IN (SELECT UNITCODE FROM SYS_UNITINFO START WITH UNITCODE = #{dwdm} CONNECT BY PRIOR UNITCODE = P_UNITCODE)</if>
+                                <if test="dwdm != null and dwdm != ''"> AND B.DWDM IN (SELECT UNITCODE FROM SYS_UNITINFO START WITH UNITCODE = #{dwdm} CONNECT BY PRIOR UNITCODE = P_UNITCODE)</if>
                                 <if test="yclx != null and yclx != ''"> AND B.YCLX = #{yclx}</if>
                                 GROUP BY A.WELLNAME, A.SECTION
                                 ) A

vseaf4.4-template-starter-dev/src/main/resources/application.properties

@@ -13,8 +13,8 @@ spring.datasource.password=life1sShort
 #spring.datasource.username=zsyx
 #spring.datasource.password=ZCK#406sr
 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/property?serverTimezone=GMT%2B8&useSSL=false&characterEncoding=utf8&allowMutiQueries=true
-spring.datasource.druid.url=jdbc:oracle:thin:@192.168.2.194:1521:xe
-#spring.datasource.druid.url=jdbc:oracle:thin:@49.234.214.200:15116/xe
+#spring.datasource.druid.url=jdbc:oracle:thin:@192.168.2.194:1521:xe
+spring.datasource.druid.url=jdbc:oracle:thin:@49.234.214.200:15116/xe
 #spring.datasource.druid.url=jdbc:oracle:thin:@10.67.112.2:1521/scora
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.druid.driver-class-name=oracle.jdbc.OracleDriver