ss

docs/databases/table_create_sh-data.sql

@@ -9,7 +9,8 @@ SELECT * FROM sh_order_index soi WHERE soi.data_id LIKE '%庄河整县%' -- 951
 -- 电站数据(监管数据)
 DROP TABLE IF EXISTS `sh_order_index_jg`;
 CREATE TABLE `sh_order_index_jg`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id			varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -57,7 +58,7 @@ all_power				bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text	varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save					varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据(监管数据)';
 
 
@@ -69,7 +70,8 @@ WHERE soi.data_id LIKE '%河南安阳%' or soi.data_id LIKE '%山东曲阜%' or
 -- 电站数据(监管数据)-进件
 DROP TABLE IF EXISTS `sh_order_index_jg_jj`;
 CREATE TABLE `sh_order_index_jg_jj`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id				varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -117,7 +119,7 @@ all_power					bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text		varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save						varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            	varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据(监管数据)-进件';
 
 -- workflow:"2_3_0_0_1,1_8_0_0_1"
@@ -129,7 +131,8 @@ WHERE soij.workflow_name <> '开始(创建订单)';
 -- 电站数据(监管数据)-签约
 DROP TABLE IF EXISTS `sh_order_index_jg_qy`;
 CREATE TABLE `sh_order_index_jg_qy`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id				varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -177,7 +180,7 @@ all_power					bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text		varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save						varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            	varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据(监管数据)-签约';
 
 INSERT INTO sh_order_index_jg_qy 
@@ -188,7 +191,8 @@ WHERE soij.sign=1;
 -- 电站数据(监管数据)-交货
 DROP TABLE IF EXISTS `sh_order_index_jg_jh`;
 CREATE TABLE `sh_order_index_jg_jh`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id				varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -236,7 +240,7 @@ all_power					bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text		varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save						varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            	varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据(监管数据)-交货';
 
 INSERT INTO sh_order_index_jg_jh 
@@ -272,7 +276,8 @@ WHERE soij.workflow_name in (
 -- 电站数据(监管数据)-完工
 DROP TABLE IF EXISTS `sh_order_index_jg_wg`;
 CREATE TABLE `sh_order_index_jg_wg`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id				varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -320,7 +325,7 @@ all_power					bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text		varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save						varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            	varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据(监管数据)-完工';
 
 INSERT INTO sh_order_index_jg_wg 
@@ -344,7 +349,8 @@ WHERE soij.workflow_name in (
 -- 电站数据(监管数据)-并网
 DROP TABLE IF EXISTS `sh_order_index_jg_bw`;
 CREATE TABLE `sh_order_index_jg_bw`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id				varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -392,7 +398,7 @@ all_power					bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text		varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save						varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            	varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据(监管数据)-并网';
 
 INSERT INTO sh_order_index_jg_bw 
@@ -404,3 +410,66 @@ WHERE soij.workflow_name in (
 '(工)现场审核',         
 '(工)建转运'
 );
+
+-- 电站数据(监管数据)-建转运
+DROP TABLE IF EXISTS `sh_order_index_jg_jzy`;
+CREATE TABLE `sh_order_index_jg_jzy`  (
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
+order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
+admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
+customer_id				varchar(100)  DEFAULT NULL COMMENT '客户id',
+agent_id					varchar(100)  DEFAULT NULL COMMENT '代理商id',
+product_id				varchar(100)  DEFAULT NULL COMMENT '产品id',
+create_time				bigint  DEFAULT NULL COMMENT '创建时间',
+data_id						varchar(100)  DEFAULT NULL COMMENT '数据分组',
+workflow_unique		varchar(100)  DEFAULT NULL COMMENT '当前流程',
+prototype_id			varchar(100)  DEFAULT NULL COMMENT '产品id',
+remain_unique			varchar(100)  DEFAULT NULL COMMENT '',
+is_best						varchar(100)  DEFAULT NULL COMMENT '是否为标杆电站',
+order_type				varchar(100)  DEFAULT NULL COMMENT '电站类型',
+update_time				bigint  DEFAULT NULL COMMENT '修改时间',
+company_id				varchar(100)  DEFAULT NULL COMMENT '公司id',
+dg_name						varchar(100)  DEFAULT NULL COMMENT '数据分组说明',
+contract_life			varchar(100)  DEFAULT NULL COMMENT '合同年限',
+contract_group		varchar(100)  DEFAULT NULL COMMENT '合同组',
+agent_name				varchar(100)  DEFAULT NULL COMMENT '代理商名称',
+area_id						varchar(100)  DEFAULT NULL COMMENT '地区id',
+address						varchar(100)  DEFAULT NULL COMMENT '详细地址',
+component_number	varchar(100)  DEFAULT NULL COMMENT '光伏板块数',
+component_power		varchar(100)  DEFAULT NULL COMMENT '组件安装功率',
+admin_name				varchar(100)  DEFAULT NULL COMMENT '业务员姓名',
+admin_phone				varchar(100)  DEFAULT NULL COMMENT '业务员手机号',
+user_name					varchar(100)  DEFAULT NULL COMMENT '用户名',
+user_phone				varchar(100)  DEFAULT NULL COMMENT '用户手机号',
+id_card						varchar(100)  DEFAULT NULL COMMENT '用户身份证号',
+product_name			varchar(100)  DEFAULT NULL COMMENT '产品名称',
+workflow_name			varchar(100)  DEFAULT NULL COMMENT '流程名称',
+node_id						varchar(100)  DEFAULT NULL COMMENT 'nodeID',
+is_agree					varchar(100)  DEFAULT NULL COMMENT '审核是否通过',
+group_id					varchar(100)  DEFAULT NULL COMMENT '产品ID',
+sign							varchar(100)  DEFAULT NULL COMMENT '是否签署合同，1已签署，2未签署',
+uplode_contract		varchar(1024)  DEFAULT NULL COMMENT '手动上传-合同',
+company_name			varchar(100)  DEFAULT NULL COMMENT '所属公司名称',
+province_name			varchar(100)  DEFAULT NULL COMMENT '省',
+city_name					varchar(100)  DEFAULT NULL COMMENT '市',
+area_name					varchar(100)  DEFAULT NULL COMMENT '区/县',
+assets_no					varchar(100)  DEFAULT NULL COMMENT '资产编号',
+change_order_id		varchar(100)  DEFAULT NULL COMMENT '电站变更id',
+p_agent_name    	varchar(100)  DEFAULT NULL COMMENT '代理商名称',
+operation_id    	varchar(100)  DEFAULT NULL COMMENT '运维id',
+operation_name  	varchar(100)  DEFAULT NULL COMMENT '运维名称',
+all_power					bigint  DEFAULT NULL COMMENT '总功率',
+order_type_text		varchar(100)  DEFAULT NULL COMMENT '产品说明',
+is_save						varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
+is_m            	varchar(100)  DEFAULT NULL COMMENT '0',
+  PRIMARY KEY (`idauto`) USING BTREE
+) ENGINE=InnoDB COMMENT='电站数据(监管数据)-建转运';
+
+INSERT INTO sh_order_index_jg_jzy 
+SELECT * 
+FROM sh_order_index_jg soij
+WHERE soij.workflow_name in (   
+'建转运',   
+'(工)建转运'
+);

docs/databases/table_create_sh.sql

@@ -1,7 +1,8 @@
 
 DROP TABLE IF EXISTS `sh_order_index`;
 CREATE TABLE `sh_order_index`  (
-id bigint NOT NULL AUTO_INCREMENT COMMENT '电站id',
+idauto bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+id bigint DEFAULT NULL COMMENT '电站ID',
 order_no					varchar(100)  DEFAULT NULL COMMENT '电站编码',
 admin_id					varchar(100)  DEFAULT NULL COMMENT '创建人id',
 customer_id			varchar(100)  DEFAULT NULL COMMENT '客户id',
@@ -49,7 +50,7 @@ all_power				bigint  DEFAULT NULL COMMENT '总功率',
 order_type_text	varchar(100)  DEFAULT NULL COMMENT '产品说明',
 is_save					varchar(100)  DEFAULT NULL COMMENT '是否可编辑',
 is_m            varchar(100)  DEFAULT NULL COMMENT '0',
-  PRIMARY KEY (`id`) USING BTREE
+  PRIMARY KEY (`idauto`) USING BTREE
 ) ENGINE=InnoDB COMMENT='电站数据';
 
 

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/orderindex/OrderIndexDb.java

@@ -15,7 +15,9 @@ import lombok.Data;
 @TableName("sh_order_index")
 public class OrderIndexDb {
 
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "idauto", type = IdType.INPUT)
+    private Long idauto; // 电站id													|int		|
+
     private Long id; // 电站id													|int		|
     private String order_no; // 电站编码												|string	|
     private String admin_id; // 创建人id												|int		|

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml

@@ -34,7 +34,7 @@
     <select id="countall" resultType="java.util.Map">
         select
           IFNULL(sum(num),0) numall,
-          IFNULL(convert(sum(price*num),decimal(10,2)),0) amountall
+          convert(IFNULL(sum(price*num),0),decimal(10,2)) amountall
         from inventory
         <where> ${ew.sqlSegment} </where>
     </select>

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java

@@ -498,6 +498,7 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
             out.close();
         }
     }
+
     public List<InventoryVo> getDayReport(InventoryQuery pq) {
         InventoryQuery params = pq;
         QueryWrapper<Inventory> wq = new QueryWrapper<>();
@@ -518,7 +519,8 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
             if (StringUtils.isNotBlank(params.getEndDate())) {
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             } else {
-                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ;
+                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6)));
+                ;
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             }
             if (StringUtils.isNotBlank(params.getBrand_name())) {
@@ -546,6 +548,7 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
         }
         return b;
     }
+
     public Map<String, Object> getDayReportMap(InventoryQuery pq) {
         InventoryQuery params = pq;
         Map<String, Object> m = new HashMap<>();
@@ -567,7 +570,8 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
             if (StringUtils.isNotBlank(params.getEndDate())) {
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             } else {
-                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ;
+                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6)));
+                ;
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             }
             if (StringUtils.isNotBlank(params.getBrand_name())) {
@@ -627,7 +631,8 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
             if (StringUtils.isNotBlank(params.getEndDate())) {
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             } else {
-                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ;
+                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6)));
+                ;
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             }
             if (StringUtils.isNotBlank(params.getBrand_name())) {
@@ -655,6 +660,7 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
         }
         return b;
     }
+
     public Map<String, Object> getDayReportShMap(InventoryQuery pq) {
         InventoryQuery params = pq;
         QueryWrapper<Inventory> wq = new QueryWrapper<>();
@@ -673,7 +679,8 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
             if (StringUtils.isNotBlank(params.getEndDate())) {
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             } else {
-                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); ;
+                params.setEndDate(sdf.format(DateUtil.offsetDay(DateUtil.yesterday(), -6)));
+                ;
                 wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate());
             }
             if (StringUtils.isNotBlank(params.getBrand_name())) {
@@ -717,14 +724,17 @@ public class InventoryService extends ServiceImpl<InventoryMapper, Inventory> {
         String[] wlz = new String[]{"组件", "逆变器"};
         qw.in("materiel_group_text", wlz);
 
-        String dataDate = DateUtil.format(new Date(), "yyyy-MM-dd");
+        String dataDate = DateUtil.format(DateUtil.tomorrow(), "yyyy-MM-dd");
         if (StrUtil.isNotBlank(params.getDataDate())) {
-            dataDate = params.getDataDate();
+            dataDate = DateUtil.format(DateUtil.offsetDay(DateUtil.parse(params.getDataDate()), 1), "yyyy-MM-dd");
+//            dataDate = params.getDataDate();
         }
         qw.eq("time", dataDate);
 
         if (params.getStorehouses() != null && params.getStorehouses().length > 0) {
             qw.in("storehouse_name", params.getStorehouses());
+        } else {
+            qw.in("storehouse_name", new String[]{"江西余干库", "庄河荣名库", "安阳荣名库", "曲阜荣名库"});
         }
 
 

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java

@@ -7,6 +7,7 @@ import com.yxt.supervise.gf.api.orderindex.OrderIndexDb;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * @author feikefei
@@ -18,4 +19,7 @@ public interface OrderIndexMapper extends BaseMapper<OrderIndexDb> {
     void clearAll();
 
     double sumallpower(@Param(Constants.WRAPPER) QueryWrapper<OrderIndexDb> qw);
+
+    @Update(" ALTER TABLE sh_order_index AUTO_INCREMENT=1 ")
+    void resetAutoIncrement();
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.supervise.gf.biz.orderindex.OrderIndexMapper">
     <select id="sumallpower" resultType="java.lang.Double">
-        select sum(all_power) from sh_order_index
+        select IFNULL(sum(all_power),0) from sh_order_index
         <where> ${ew.sqlSegment} </where>
     </select>
 </mapper>

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java

@@ -636,6 +636,7 @@ public class OrderIndexService extends ServiceImpl<OrderIndexMapper, OrderIndexD
 
         // 清空所有订单索引数据
         baseMapper.clearAll();
+        baseMapper.resetAutoIncrement();
 
 
         // 分页请求并保存订单索引数据

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShOrderIndexJgMapper.java

@@ -102,4 +102,16 @@ public interface ShOrderIndexJgMapper extends BaseMapper<ShOrderIndexJg> {
         "'(工)建转运' " +
         ")")
     void initBw();
+
+    @Delete("delete from sh_order_index_jg_jzy where 1=1 ")
+    void clearJzy();
+
+    @Insert("INSERT INTO sh_order_index_jg_jzy  " +
+            "SELECT *  " +
+            "FROM sh_order_index_jg soij " +
+            "WHERE soij.workflow_name in (    " +
+            "'建转运',      " +
+            "'(工)建转运' " +
+            ")")
+    void initJzy();
 }

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShOrderIndexJgService.java

@@ -26,6 +26,8 @@ public class ShOrderIndexJgService extends ServiceImpl<ShOrderIndexJgMapper, ShO
         this.baseMapper.initWg();
         this.baseMapper.clearBw();
         this.baseMapper.initBw();
+        this.baseMapper.clearJzy();
+        this.baseMapper.initJzy();
 
         DateTime dateTime = DateUtil.offsetDay(new Date(), -1);
         String yestday = DateUtil.format(dateTime, "yyyy-MM-dd");

yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShReportXmlctgbService.java

@@ -48,11 +48,13 @@ public class ShReportXmlctgbService extends ServiceImpl<ShReportXmlctgbMapper, S
         List<ShReportXmlctgb> listJh = buildDayOfJd(day, createTime, "sh_order_index_jg_jh", "30", "交货");
         List<ShReportXmlctgb> listWg = buildDayOfJd(day, createTime, "sh_order_index_jg_wg", "40", "完工");
         List<ShReportXmlctgb> listBw = buildDayOfJd(day, createTime, "sh_order_index_jg_bw", "50", "并网");
+        List<ShReportXmlctgb> listJzy = buildDayOfJd(day, createTime, "sh_order_index_jg_jzy", "60", "建转运");
         list.addAll(listJj);
         list.addAll(listQy);
         list.addAll(listJh);
         list.addAll(listWg);
         list.addAll(listBw);
+        list.addAll(listJzy);
         baseMapper.delete(new QueryWrapper<ShReportXmlctgb>().eq("sjjzrq", day));
         this.saveBatch(list);
         return list;