diff --git a/docs/databases/table_create_sh-data.sql b/docs/databases/table_create_sh-data.sql index 96b625a..c8fa912 100644 --- a/docs/databases/table_create_sh-data.sql +++ b/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 @@ -403,4 +409,67 @@ 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 ( +'建转运', +'(工)建转运' ); \ No newline at end of file diff --git a/docs/databases/table_create_sh.sql b/docs/databases/table_create_sh.sql index 9c06e01..44b377c 100644 --- a/docs/databases/table_create_sh.sql +++ b/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='电站数据'; diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/orderindex/OrderIndexDb.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/orderindex/OrderIndexDb.java index 987ed0e..adf2208 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/api/orderindex/OrderIndexDb.java +++ b/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 | diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml index 281b79c..07c4216 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryMapper.xml @@ -34,7 +34,7 @@ diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java index 33c530c..92ad204 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/inventory/InventoryService.java @@ -67,18 +67,18 @@ public class InventoryService extends ServiceImpl { @Resource private EnterpriseInformationFeign enterpriseInformationFeign; - public ResultBean save(InventoryIndex inventoryIndex){ + public ResultBean save(InventoryIndex inventoryIndex) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); DecimalFormat df = new DecimalFormat("#0.0000"); Date date = new Date(); ResultBean rb = ResultBean.fireFail(); BaseResponse> api$system$inventory$index = ShRequester.getApi$system$inventory$index(inventoryIndex); List list = api$system$inventory$index.getData().getList(); - baseMapper.delete(new QueryWrapper().eq("time",sdf.format(date))); - pushInventoryDataService.remove(new QueryWrapper().eq("time",sdf.format(date))); + baseMapper.delete(new QueryWrapper().eq("time", sdf.format(date))); + pushInventoryDataService.remove(new QueryWrapper().eq("time", sdf.format(date))); for (com.yxt.supervise.gf.shanhai.resp.Inventory inventory : list) { Inventory inventory1 = new Inventory(); - BeanUtil.copyProperties(inventory,inventory1); + BeanUtil.copyProperties(inventory, inventory1); inventory1.setTime(sdf.format(date)); baseMapper.insert(inventory1); } @@ -93,25 +93,25 @@ public class InventoryService extends ServiceImpl { if (key.equals("江西余干库") || key.equals("庄河荣名库") || key.equals("安阳荣名库") || key.equals("藁城荣名库") || key.equals("曲阜荣名库")) { List value = stringListEntry.getValue(); filterValue = value.stream().filter(t -> t.getMateriel_group_text().equals("组件") || t.getMateriel_group_text().equals("逆变器")).collect(Collectors.toList()); - if (filterValue.size() != 0){ - map.put(stringListEntry.getKey(),filterValue); + if (filterValue.size() != 0) { + map.put(stringListEntry.getKey(), filterValue); for (com.yxt.supervise.gf.shanhai.resp.Inventory inventory : filterValue) { PushInventoryData pushInventoryData = new PushInventoryData(); - BeanUtil.copyProperties(inventory,pushInventoryData,"id"); + BeanUtil.copyProperties(inventory, pushInventoryData, "id"); pushInventoryData.setTime(sdf.format(date)); pushInventoryDataService.save(pushInventoryData); } } } //汇总数据添加仓库sid 用作传输数据到仓库中 - if (filterValue != null){ + if (filterValue != null) { PagerQuery sq = new PagerQuery<>(); ShStorehouseQuery shStorehouseQuery = new ShStorehouseQuery(); shStorehouseQuery.setName(key); sq.setParams(shStorehouseQuery); ResultBean resultBean = shStorehouseFeign.listPage(sq); - LinkedHashMap records = (LinkedHashMap)resultBean.getData(); - List> data = (ArrayList>)records.get("records"); + LinkedHashMap records = (LinkedHashMap) resultBean.getData(); + List> data = (ArrayList>) records.get("records"); //查询该企业信息 PagerQuery sw = new PagerQuery<>(); EnterpriseInformationQuery enterpriseInformationQuery = new EnterpriseInformationQuery(); @@ -374,12 +374,12 @@ public class InventoryService extends ServiceImpl { // fileOut.close(); // } - public PagerVo listPage(PagerQuery pq){ + public PagerVo listPage(PagerQuery pq) { InventoryQuery params = pq.getParams(); QueryWrapper wq = new QueryWrapper<>(); - if (params != null){ + if (params != null) { if (params.getStorehouse_name() != null || !params.getStorehouse_name().equals("")) - wq.eq("storehouse_name",params.getStorehouse_name()); + wq.eq("storehouse_name", params.getStorehouse_name()); } IPage page = PagerUtil.queryToPage(pq); IPage inventoryVoIPage = baseMapper.selectPageVo(page, wq); @@ -387,7 +387,7 @@ public class InventoryService extends ServiceImpl { return vo; } - public void export(String storehouse_name, HttpServletResponse response) throws Exception{ + public void export(String storehouse_name, HttpServletResponse response) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date date = new Date(); OutputStream out = response.getOutputStream(); @@ -398,11 +398,11 @@ public class InventoryService extends ServiceImpl { // 下载文件能正常显示中文 response.setHeader( "Content-Disposition", - "attachment;filename=" + URLEncoder.encode(storehouse_name + sdf.format(date)+".xlsx", "UTF-8"));//导出的Excel文件名称 + "attachment;filename=" + URLEncoder.encode(storehouse_name + sdf.format(date) + ".xlsx", "UTF-8"));//导出的Excel文件名称 // response.setHeader("Access-Control-Expose-Headers", "FileName"); List inventories = baseMapper.selectInventoryByStorehouseName(storehouse_name);//数据查询--需要导出的数据 //行标题设置 - String[] headList = {"序号","仓库名称", "物料组", "物料编号", "物料名称", "物料品牌", "物料单价", "库存数量", "货值"}; + String[] headList = {"序号", "仓库名称", "物料组", "物料编号", "物料名称", "物料品牌", "物料单价", "库存数量", "货值"}; /*Excel文件创建完毕*/ CreationHelper createHelper = wb.getCreationHelper(); //创建帮助工具 /*创建表单*/ @@ -432,10 +432,10 @@ public class InventoryService extends ServiceImpl { cellStyle.setFont(head); cellStyle.setAlignment(HorizontalAlignment.CENTER); //设置水平对齐方式 cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); //设置垂直对齐方式 - CellRangeAddress callRangeAddress = new CellRangeAddress(0,0,0,headList.length-1); + CellRangeAddress callRangeAddress = new CellRangeAddress(0, 0, 0, headList.length - 1); Cell cell1 = headRow.createCell(0); cell1.setCellStyle(cellStyle); - cell1.setCellValue(storehouse_name + "("+ sdf.format(date) +")"); + cell1.setCellValue(storehouse_name + "(" + sdf.format(date) + ")"); sheet.addMergedRegion(callRangeAddress); Row headRow2 = sheet.createRow(1); for (int i = 0; i < headList.length; i++) { //遍历表头数据 @@ -453,33 +453,33 @@ public class InventoryService extends ServiceImpl { cell.setCellValue(createHelper.createRichTextString(String.valueOf(a++))); cell = row.createCell(1); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getStorehouse_name()==null?"":inventories.get(j).getStorehouse_name())); + .getStorehouse_name() == null ? "" : inventories.get(j).getStorehouse_name())); cell = row.createCell(2); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getMateriel_group_text()==null?"":inventories.get(j).getMateriel_group_text())); + .getMateriel_group_text() == null ? "" : inventories.get(j).getMateriel_group_text())); cell = row.createCell(3); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getMateriel_no()==null?"":inventories.get(j).getMateriel_no())); + .getMateriel_no() == null ? "" : inventories.get(j).getMateriel_no())); cell = row.createCell(4); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getMateriel_name()==null?"":inventories.get(j).getMateriel_name())); + .getMateriel_name() == null ? "" : inventories.get(j).getMateriel_name())); cell = row.createCell(5); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getBrand_name() == null?"":inventories.get(j).getBrand_name())); + .getBrand_name() == null ? "" : inventories.get(j).getBrand_name())); cell = row.createCell(6); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getPrice()==null?"":inventories.get(j).getPrice().toString())); + .getPrice() == null ? "" : inventories.get(j).getPrice().toString())); cell = row.createCell(7); cell.setCellValue(createHelper.createRichTextString(inventories.get(j) - .getNum()==null?"":inventories.get(j).getNum().toString())); + .getNum() == null ? "" : inventories.get(j).getNum().toString())); cell = row.createCell(8); Double v = inventories.get(j).getPrice() * inventories.get(j).getNum(); - count+=v; - cell.setCellValue(createHelper.createRichTextString(v == null ? "":v.toString())); + count += v; + cell.setCellValue(createHelper.createRichTextString(v == null ? "" : v.toString())); } //创建合计 - Row row = sheet.createRow(inventories.size()+2); + Row row = sheet.createRow(inventories.size() + 2); Cell cell = row.createCell(0); cell.setCellStyle(dataStyle); cell.setCellValue(createHelper.createRichTextString("合计")); @@ -491,119 +491,123 @@ public class InventoryService extends ServiceImpl { sheet.autoSizeColumn(i); } wb.write(out); //将workbook写入文件流 - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); - }finally { + } finally { wb.close(); out.close(); } } - public List getDayReport(InventoryQuery pq){ + + public List getDayReport(InventoryQuery pq) { InventoryQuery params = pq; QueryWrapper wq = new QueryWrapper<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (params != null){ + if (params != null) { if (StringUtils.isNotBlank(params.getStorehouse_name())) - wq.eq("storehouse_name",params.getStorehouse_name()); + wq.eq("storehouse_name", params.getStorehouse_name()); - if (StringUtils.isNotBlank(params.getStartDate())){ + if (StringUtils.isNotBlank(params.getStartDate())) { wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); - }else{ + } else { params.setStartDate(sdf.format(DateUtil.yesterday())); - wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); + wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); } - 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))); ; - wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); + 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))); + ; + wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); } - if(StringUtils.isNotBlank(params.getBrand_name())){ - wq.eq("brand_name",params.getBrand_name()); + if (StringUtils.isNotBlank(params.getBrand_name())) { + wq.eq("brand_name", params.getBrand_name()); } - if(StringUtils.isNotBlank(params.getMateriel_group())){ - wq.in("materiel_group",params.getMateriel_group()); - }else{ - wq.in("materiel_group","1","2"); + if (StringUtils.isNotBlank(params.getMateriel_group())) { + wq.in("materiel_group", params.getMateriel_group()); + } else { + wq.in("materiel_group", "1", "2"); } } List inventoryVos = baseMapper.getInventoryByTime(wq); - List b=new ArrayList<>(); + List b = new ArrayList<>(); //6 - long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); - for(int k=0;k getDayReportMap(InventoryQuery pq){ + + public Map getDayReportMap(InventoryQuery pq) { InventoryQuery params = pq; - Map m=new HashMap<>(); + Map m = new HashMap<>(); QueryWrapper wq = new QueryWrapper<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (params != null){ + if (params != null) { if (StringUtils.isNotBlank(params.getStorehouse_name())) - wq.eq("storehouse_name",params.getStorehouse_name()); + wq.eq("storehouse_name", params.getStorehouse_name()); - if (StringUtils.isNotBlank(params.getStartDate())){ + if (StringUtils.isNotBlank(params.getStartDate())) { wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); - }else{ + } else { params.setStartDate(sdf.format(DateUtil.yesterday())); - wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); + wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); } - 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))); ; - wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); + 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))); + ; + wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); } - if(StringUtils.isNotBlank(params.getBrand_name())){ - wq.eq("brand_name",params.getBrand_name()); + if (StringUtils.isNotBlank(params.getBrand_name())) { + wq.eq("brand_name", params.getBrand_name()); } - if(StringUtils.isNotBlank(params.getMateriel_group())){ - wq.in("materiel_group",params.getMateriel_group()); - }else{ - wq.in("materiel_group","1","2"); + if (StringUtils.isNotBlank(params.getMateriel_group())) { + wq.in("materiel_group", params.getMateriel_group()); + } else { + wq.in("materiel_group", "1", "2"); } } List inventoryVos = baseMapper.getInventoryByTime(wq); - List a=new ArrayList<>(); - List b=new ArrayList<>(); + List a = new ArrayList<>(); + List b = new ArrayList<>(); //6 - long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); - for(int k=0;k getDayReportSh(InventoryQuery pq){ + public List getDayReportSh(InventoryQuery pq) { InventoryQuery params = pq; QueryWrapper wq = new QueryWrapper<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (params != null){ + if (params != null) { // if (StringUtils.isNotBlank(params.getStartDate())){ // wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); @@ -616,93 +620,96 @@ public class InventoryService extends ServiceImpl { // }else { // wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",sdf.format(DateUtil.offsetDay(DateUtil.yesterday(),-6))); // } - if (StringUtils.isNotBlank(params.getStartDate())){ + if (StringUtils.isNotBlank(params.getStartDate())) { wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); - }else{ + } else { params.setStartDate(sdf.format(DateUtil.yesterday())); - wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); + wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); } - 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))); ; - wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); + 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))); + ; + wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); } - if(StringUtils.isNotBlank(params.getBrand_name())){ - wq.eq("brand_name",params.getBrand_name()); + if (StringUtils.isNotBlank(params.getBrand_name())) { + wq.eq("brand_name", params.getBrand_name()); } - if(StringUtils.isNotBlank(params.getMateriel_group())){ - wq.in("materiel_group",params.getMateriel_group()); - }else{ - wq.in("materiel_group","1","2"); + if (StringUtils.isNotBlank(params.getMateriel_group())) { + wq.in("materiel_group", params.getMateriel_group()); + } else { + wq.in("materiel_group", "1", "2"); } } - wq.in("storehouse_code","07300003","07300006","07300008","07300002"); + wq.in("storehouse_code", "07300003", "07300006", "07300008", "07300002"); List inventoryVos = baseMapper.getDayReportSh(wq); - List b=new ArrayList<>(); + List b = new ArrayList<>(); //6 - long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); - for(int k=0;k getDayReportShMap(InventoryQuery pq){ + + public Map getDayReportShMap(InventoryQuery pq) { InventoryQuery params = pq; QueryWrapper wq = new QueryWrapper<>(); - Map m=new HashMap<>(); + Map m = new HashMap<>(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (params != null){ + if (params != null) { - if (StringUtils.isNotBlank(params.getStartDate())){ + if (StringUtils.isNotBlank(params.getStartDate())) { wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); - }else{ + } else { params.setStartDate(sdf.format(DateUtil.yesterday())); - wq.le("STR_TO_DATE(time,'%Y-%m-%d')",params.getStartDate()); + wq.le("STR_TO_DATE(time,'%Y-%m-%d')", params.getStartDate()); } - 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))); ; - wq.ge("STR_TO_DATE(time,'%Y-%m-%d')",params.getEndDate()); + 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))); + ; + wq.ge("STR_TO_DATE(time,'%Y-%m-%d')", params.getEndDate()); } - if(StringUtils.isNotBlank(params.getBrand_name())){ - wq.eq("brand_name",params.getBrand_name()); + if (StringUtils.isNotBlank(params.getBrand_name())) { + wq.eq("brand_name", params.getBrand_name()); } - if(StringUtils.isNotBlank(params.getMateriel_group())){ - wq.in("materiel_group",params.getMateriel_group()); - }else{ - wq.in("materiel_group","1","2"); + if (StringUtils.isNotBlank(params.getMateriel_group())) { + wq.in("materiel_group", params.getMateriel_group()); + } else { + wq.in("materiel_group", "1", "2"); } } - wq.in("storehouse_code","07300003","07300006","07300008","07300002"); + wq.in("storehouse_code", "07300003", "07300006", "07300008", "07300002"); List inventoryVos = baseMapper.getDayReportSh(wq); - List a=new ArrayList<>(); - List b=new ArrayList<>(); + List a = new ArrayList<>(); + List b = new ArrayList<>(); //6 - long i=DateUtil.between(DateUtil.parse(params.getStartDate()),DateUtil.parse(params.getEndDate()), DateUnit.DAY); - for(int k=0;k { String[] wlz = new String[]{"组件", "逆变器"}; qw.in("materiel_group_text", wlz); - String dataDate = DateUtil.format(new Date(), "yyyy-MM-dd"); - if(StrUtil.isNotBlank(params.getDataDate())){ - dataDate = params.getDataDate(); + String dataDate = DateUtil.format(DateUtil.tomorrow(), "yyyy-MM-dd"); + if (StrUtil.isNotBlank(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&¶ms.getStorehouses().length>0){ + if (params.getStorehouses() != null && params.getStorehouses().length > 0) { qw.in("storehouse_name", params.getStorehouses()); + } else { + qw.in("storehouse_name", new String[]{"江西余干库", "庄河荣名库", "安阳荣名库", "曲阜荣名库"}); } - Map countall = baseMapper.countall(qw); + Map countall = baseMapper.countall(qw); map.put("countall", countall); diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java index 156e5e2..23668c7 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.java +++ b/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 { void clearAll(); double sumallpower(@Param(Constants.WRAPPER) QueryWrapper qw); + + @Update(" ALTER TABLE sh_order_index AUTO_INCREMENT=1 ") + void resetAutoIncrement(); } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml index 254c3df..597fef4 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexMapper.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java index 7cc9ea8..ffa0447 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/OrderIndexService.java @@ -636,6 +636,7 @@ public class OrderIndexService extends ServiceImpl { "'(工)建转运' " + ")") 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(); } diff --git a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShOrderIndexJgService.java b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShOrderIndexJgService.java index cb7c7d2..57bd9fc 100644 --- a/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShOrderIndexJgService.java +++ b/yxt-supervise-gf-biz/src/main/java/com/yxt/supervise/gf/biz/orderindex/ShOrderIndexJgService.java @@ -26,6 +26,8 @@ public class ShOrderIndexJgService extends ServiceImpl listJh = buildDayOfJd(day, createTime, "sh_order_index_jg_jh", "30", "交货"); List listWg = buildDayOfJd(day, createTime, "sh_order_index_jg_wg", "40", "完工"); List listBw = buildDayOfJd(day, createTime, "sh_order_index_jg_bw", "50", "并网"); + List 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().eq("sjjzrq", day)); this.saveBatch(list); return list;