Merge branch 'master' of http://192.168.2.194:3000/summer76/cyyzs-api

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

@@ -35,7 +35,7 @@ public class ProductionDataController {
     }
 
     @PostMapping("/productionExport")
-    @ApiOperation("导出本单位及字段数据")
+    @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/controller/StaticDataController.java

@@ -1,9 +1,14 @@
 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.StaticDataParam;
+import cn.com.victorysoft.business.cyyzs.param.StaticExportParam;
 import cn.com.victorysoft.business.cyyzs.service.StaticDataService;
 
+import cn.com.victorysoft.business.sys.entity.ExportResult;
+import cn.com.victorysoft.business.util.ExcelUtils;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,4 +37,11 @@ public class StaticDataController {
         return staticDataService.update(param);
     }
 
+    @PostMapping("/export")
+    @ApiOperation("导出静态数据")
+    public ExportResult productionExport(@RequestBody StaticExportParam param){
+        List<StaticData> list = staticDataService.export(param);
+        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
+    }
+
 }

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

@@ -1,16 +1,18 @@
 package cn.com.victorysoft.business.cyyzs.controller;
 
 import cn.com.victorysoft.business.cyyzs.entity.WellDaily;
+import cn.com.victorysoft.business.cyyzs.param.WellDailyExport;
 import cn.com.victorysoft.business.cyyzs.param.WellDailyParam;
 import cn.com.victorysoft.business.cyyzs.service.WellDailyService;
+import cn.com.victorysoft.business.sys.entity.ExportResult;
+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.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 javax.annotation.Resource;
+import java.util.List;
 
 @Api(tags = "单井日报")
 @RestController
@@ -23,8 +25,14 @@ public class WellDailyController {
     @GetMapping("/page")
     @ApiOperation("查询单井日报")
     public PageInfo<WellDaily> selectList(WellDailyParam param) {
-        return wellDailyService.selectList(param);
+        return wellDailyService.selectPage(param);
     }
 
+    @PostMapping("/export")
+    @ApiOperation("导出单井日报")
+    public ExportResult productionExport(@RequestBody WellDailyExport param){
+        List<WellDaily> list = wellDailyService.selectList(param);
+        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
+    }
 
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/LayeredWater.java

@@ -116,7 +116,7 @@ public class LayeredWater implements Serializable {
     /**
      * 分析评价
      */
-    private BigDecimal fxpj;
+    private String fxpj;
 
 
     private static final long serialVersionUID = 1L;

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/ProductionData.java

@@ -1,5 +1,6 @@
 package cn.com.victorysoft.business.cyyzs.entity;
 
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -70,4 +71,9 @@ public class ProductionData {
      * 合格率
      */
     private BigDecimal hgl;
+
+    /**
+     * 导出排序
+     */
+    private Integer rn;
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/StaticData.java

@@ -118,5 +118,12 @@ public class StaticData implements Serializable {
      */
     private BigDecimal sthd;
 
+    /**
+     * 序号
+     */
+    private Integer rn;
+
     private static final long serialVersionUID = 1L;
+
+
 }

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/entity/WellDaily.java

@@ -78,6 +78,11 @@ public class WellDaily implements Serializable {
      */
     private String bz;
 
+    /**
+     * 排序
+     */
+    private Integer rn;
+
 
 
     private static final long serialVersionUID = 1L;

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

@@ -0,0 +1,21 @@
+package cn.com.victorysoft.business.cyyzs.param;
+
+import cn.com.victorysoft.business.sys.param.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.sf.json.JSONArray;
+
+import java.util.Date;
+
+@ApiModel("静态数据参数导出")
+@Data
+public class StaticExportParam extends StaticDataParam {
+
+    @ApiModelProperty("文件名称")
+    private String fileName = "导出文件";
+
+    @ApiModelProperty("导出表头")
+    private JSONArray columnConfig;
+
+}

vseaf4.4-cyyzs/src/main/java/cn/com/victorysoft/business/cyyzs/param/WellDailyExport.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 WellDailyExport extends WellDailyParam{
+
+    @ApiModelProperty("文件名称")
+    private String fileName = "导出文件";
+
+    @ApiModelProperty("导出表头")
+    private JSONArray columnConfig;
+
+}

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

@@ -27,6 +27,10 @@ public class ProductionDataService {
 
 
     public List<ProductionData> selectList(ProductionParam param) {
-        return productionDataDao.selectList(param);
+        List<ProductionData> list = productionDataDao.selectList(param);
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setRn(i + 1);
+        }
+        return list;
     }
 }

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

@@ -26,6 +26,17 @@ public class StaticDataService {
         return new PageInfo<>(staticDataDao.selectList(param));
     }
 
+    /**
+     * 导出静态数据
+     */
+    public List<StaticData> export(StaticDataParam param) {
+        List<StaticData> list = staticDataDao.selectList(param);
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setRn(i + 1);
+        }
+        return list;
+    }
+
     public int update(StaticData param) {
         return staticDataDao.update(param);
     }

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

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -20,9 +21,20 @@ public class WellDailyService {
     /**
      * 查询分层注水评价
      */
-    public PageInfo<WellDaily> selectList(WellDailyParam param) {
+    public PageInfo<WellDaily> selectPage(WellDailyParam param) {
         PageUtils.startPage(param);
         return new PageInfo<>(wellDailyDao.selectList(param));
     }
 
+    /**
+     * 查询分层注水评价
+     */
+    public List<WellDaily> selectList(WellDailyParam param) {
+        List<WellDaily> list = wellDailyDao.selectList(param);
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setRn(i + 1);
+        }
+        return list;
+    }
+
 }

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

@@ -35,9 +35,12 @@
         case when sum(PLAN_DAILY_WATER) = '0' then 0 when sum(PLAN_DAILY_WATER) = null then 0 else
         ROUND((sum(DAILY_WATER)/sum(PLAN_DAILY_WATER)), 2) end cz,
         case
-        when sum(OPEN_TIME) = '0' then 0 when sum(OPEN_TIME) = null then 0
-        when sum(PLAN_DAILY_WATER) = '0' then 0 when sum(PLAN_DAILY_WATER) = null then 0
-        else ROUND((sum(DAILY_WATER)/sum(OPEN_TIME))/sum(PLAN_DAILY_WATER), 2) end fxpj
+        when sum(DAILY_WATER) = 0 then '不检'
+        when
+        (case when sum(PLAN_DAILY_WATER) != 0 then sum(DAILY_WATER)/sum(PLAN_DAILY_WATER) end) >= 0.8 and   (case when sum(PLAN_DAILY_WATER) != 0 then sum(DAILY_WATER)/sum(PLAN_DAILY_WATER) end) <= 1.2 then '合格'
+        when  (case when sum(PLAN_DAILY_WATER) != 0 then sum(DAILY_WATER)/sum(PLAN_DAILY_WATER) end) < 0.8 then '欠注'
+        when  (case when sum(PLAN_DAILY_WATER) != 0 then sum(DAILY_WATER)/sum(PLAN_DAILY_WATER) end) > 1.2 then '超注'
+        else '不清' end fxpj
         from WELL_SECTION_DAILY
         WHERE RECORD_DATE >= #{startdate,jdbcType=VARCHAR} AND RECORD_DATE <= #{enddate,jdbcType=VARCHAR}
         group by SECTION,WELLNAME) b on a.SECTION = b.SECTION and a.WELLNAME = b.WELLNAME
@@ -59,7 +62,7 @@
             and a.WELLNAME = #{wellname,jdbcType=VARCHAR}
         </if>
         <if test="evaluation != null and evaluation != ''">
-
+            and fxpj = #{evaluation,jdbcType=VARCHAR}
         </if>
         order by a.WELLNAME
     </select>

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

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

@@ -11,8 +11,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