Skip to content

A
amos-boot-zx-biz
Commit fbb1cdd5 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

拆分已收货为备货完成和已收货

parent a962c43e
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 44 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/StatisicsHomePageEnum.java
View file @ fbb1cdd5
...@@ -27,29 +27,31 @@ public enum StatisicsHomePageEnum { ...@@ -27,29 +27,31 @@ public enum StatisicsHomePageEnum {
备货进行中容量("bhjxzrl",15), 备货进行中容量("bhjxzrl",15),
备货已完成("bhywc",16), 备货已完成("bhywc",16),
备货已完成容量("bhywcrl",17), 备货已完成容量("bhywcrl",17),
施工未通过("sgwtg",18), 备货完成("bhwc",18),
施工未通过容量("sgwtgrl",19), 备货完成容量("bhwcrl",19),
施工进行中("sgjxz",20), 施工未通过("sgwtg",20),
施工进行中容量("sgjxzrl",21), 施工未通过容量("sgwtgrl",21),
施工已完成("sgywc",22), 施工进行中("sgjxz",22),
施工已完成容量("sgywcrl",23), 施工进行中容量("sgjxzrl",23),
并网未通过("bwwtg",24), 施工已完成("sgywc",24),
并网未通过容量("bwwtgrl",25), 施工已完成容量("sgywcrl",25),
并网进行中("bwjxz",26), 并网未通过("bwwtg",26),
并网进行中容量("bwjxzrl",27), 并网未通过容量("bwwtgrl",27),
并网已完成("bwywc",28), 并网进行中("bwjxz",28),
并网已完成容量("bwywcrl",29), 并网进行中容量("bwjxzrl",29),
验收未通过("yswtg",30), 并网已完成("bwywc",30),
验收未通过容量("yswtgrl",31), 并网已完成容量("bwywcrl",31),
验收进行中("ysjxz",32), 验收未通过("yswtg",32),
验收进行中容量("ysjxzrl",33), 验收未通过容量("yswtgrl",33),
验收已完成("ysywc",34), 验收进行中("ysjxz",34),
验收已完成容量("ysywcrl",35), 验收进行中容量("ysjxzrl",35),
融资公司("rzgs",36), 验收已完成("ysywc",36),
融资户数("rzhs",37), 验收已完成容量("ysywcrl",37),
融资容量("rzrl",38), 融资公司("rzgs",38),
融资单价("rzdj",39), 融资户数("rzhs",39),
放款金额("fkje",40); 融资容量("rzrl",40),
融资单价("rzdj",40),
放款金额("fkje",42);
/** /**
* 名称，描述 * 名称，描述
*/ */
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml
View file @ fbb1cdd5
...@@ -401,8 +401,10 @@ ...@@ -401,8 +401,10 @@
'' AS kcjxzrl, '' AS kcjxzrl,
SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END) AS kcywc, SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END) AS kcywc,
ROUND(COALESCE(SUM(CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS kcywcrl, ROUND(COALESCE(SUM(CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS kcywcrl,
SUM(CASE WHEN ph.preparation_money_state = '备货完成' or ph.preparation_money_state = '已收货'THEN 1 ELSE 0 END) AS bhywc, SUM(CASE WHEN ph.preparation_money_state = '已收货'THEN 1 ELSE 0 END) AS bhywc,
ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成'or ph.preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl, ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl,
SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN 1 ELSE 0 END) AS bhwc,
ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhwcrl,
SUM(CASE WHEN ph.preparation_money_state = '待发货' or ph.preparation_money_state = '暂存发货'or ph.preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS bhwtg, SUM(CASE WHEN ph.preparation_money_state = '待发货' or ph.preparation_money_state = '暂存发货'or ph.preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS bhwtg,
'' AS bhjxzrl, '' AS bhjxzrl,
SUM(CASE WHEN ph.preparation_money_state = '待收货' THEN 1 ELSE 0 END) AS bhjxz, SUM(CASE WHEN ph.preparation_money_state = '待收货' THEN 1 ELSE 0 END) AS bhjxz,
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java
View file @ fbb1cdd5
...@@ -365,13 +365,13 @@ public class StatisticsHomepageServiceImpl { ...@@ -365,13 +365,13 @@ public class StatisticsHomepageServiceImpl {
//判断是不是区域公司存在还款计划 若不存在则给0 //判断是不是区域公司存在还款计划 若不存在则给0
for (Map<String, Object> stringObjectMap : rent) { for (Map<String, Object> stringObjectMap : rent) {
if (stringObjectMap.get("regionalCompaniesCode").equals(map.get("regionalCompaniesCode"))){ if (stringObjectMap.get("regionalCompaniesCode").equals(map.get("regionalCompaniesCode"))){
Cell cell3 = firstSheet.getRow(startNum).createCell(41); Cell cell3 = firstSheet.getRow(startNum).createCell(43);
cell3.setCellValue(stringObjectMap.get("yhk").toString()); cell3.setCellValue(stringObjectMap.get("yhk").toString());
applyBorder(cell3); applyBorder(cell3);
Cell cell1 = firstSheet.getRow(startNum).createCell(42); Cell cell1 = firstSheet.getRow(startNum).createCell(44);
cell1.setCellValue(stringObjectMap.get("jnwhk").toString()); cell1.setCellValue(stringObjectMap.get("jnwhk").toString());
applyBorder(cell1); applyBorder(cell1);
Cell cell2 = firstSheet.getRow(startNum).createCell(43); Cell cell2 = firstSheet.getRow(startNum).createCell(45);
cell2.setCellValue(stringObjectMap.get("sywhk").toString()); cell2.setCellValue(stringObjectMap.get("sywhk").toString());
applyBorder(cell2); applyBorder(cell2);
...@@ -380,23 +380,23 @@ public class StatisticsHomepageServiceImpl { ...@@ -380,23 +380,23 @@ public class StatisticsHomepageServiceImpl {
} }
if (flag){ if (flag){
Cell cell3 = firstSheet.getRow(startNum).createCell(41); Cell cell3 = firstSheet.getRow(startNum).createCell(43);
cell3.setCellValue(0); cell3.setCellValue(0);
applyBorder(cell3); applyBorder(cell3);
Cell cell1 = firstSheet.getRow(startNum).createCell(42); Cell cell1 = firstSheet.getRow(startNum).createCell(44);
cell1.setCellValue(0); cell1.setCellValue(0);
applyBorder(cell1); applyBorder(cell1);
Cell cell2 = firstSheet.getRow(startNum).createCell(43); Cell cell2 = firstSheet.getRow(startNum).createCell(45);
cell2.setCellValue(0); cell2.setCellValue(0);
applyBorder(cell2); applyBorder(cell2);
} }
//合并表格及设置样式 //合并表格及设置样式
CellRangeAddress cellRangeAddress2 = new CellRangeAddress(startNum, endNum, 1, 1); CellRangeAddress cellRangeAddress2 = new CellRangeAddress(startNum, endNum, 1, 1);
CellRangeAddress cellRangeAddress = new CellRangeAddress(startNum, endNum, 2, 2); CellRangeAddress cellRangeAddress = new CellRangeAddress(startNum, endNum, 2, 2);
CellRangeAddress cellRangeAddress1 = new CellRangeAddress(startNum, endNum, 36, 36); CellRangeAddress cellRangeAddress1 = new CellRangeAddress(startNum, endNum, 38, 38);
CellRangeAddress cellRangeAddress3 = new CellRangeAddress(startNum, endNum, 41, 41); CellRangeAddress cellRangeAddress3 = new CellRangeAddress(startNum, endNum, 43, 43);
CellRangeAddress cellRangeAddress4 = new CellRangeAddress(startNum, endNum, 42, 42); CellRangeAddress cellRangeAddress4 = new CellRangeAddress(startNum, endNum, 44, 44);
CellRangeAddress cellRangeAddress5 = new CellRangeAddress(startNum, endNum, 43, 43); CellRangeAddress cellRangeAddress5 = new CellRangeAddress(startNum, endNum, 45, 45);
firstSheet.addMergedRegion(cellRangeAddress); firstSheet.addMergedRegion(cellRangeAddress);
firstSheet.addMergedRegion(cellRangeAddress1); firstSheet.addMergedRegion(cellRangeAddress1);
firstSheet.addMergedRegion(cellRangeAddress2); firstSheet.addMergedRegion(cellRangeAddress2);
...@@ -426,13 +426,13 @@ public class StatisticsHomepageServiceImpl { ...@@ -426,13 +426,13 @@ public class StatisticsHomepageServiceImpl {
//判断是不是区域公司存在还款计划 若不存在则给0 //判断是不是区域公司存在还款计划 若不存在则给0
for (Map<String, Object> stringObjectMap : rent) { for (Map<String, Object> stringObjectMap : rent) {
if (stringObjectMap.get("regionalCompaniesCode").equals(map.get("regionalCompaniesCode"))){ if (stringObjectMap.get("regionalCompaniesCode").equals(map.get("regionalCompaniesCode"))){
Cell cell3 = firstSheet.getRow(startNum).createCell(41); Cell cell3 = firstSheet.getRow(startNum).createCell(43);
cell3.setCellValue(stringObjectMap.get("yhk").toString()); cell3.setCellValue(stringObjectMap.get("yhk").toString());
applyBorder(cell3); applyBorder(cell3);
Cell cell1 = firstSheet.getRow(startNum).createCell(42); Cell cell1 = firstSheet.getRow(startNum).createCell(44);
cell1.setCellValue(stringObjectMap.get("jnwhk").toString()); cell1.setCellValue(stringObjectMap.get("jnwhk").toString());
applyBorder(cell1); applyBorder(cell1);
Cell cell2 = firstSheet.getRow(startNum).createCell(43); Cell cell2 = firstSheet.getRow(startNum).createCell(45);
cell2.setCellValue(stringObjectMap.get("sywhk").toString()); cell2.setCellValue(stringObjectMap.get("sywhk").toString());
applyBorder(cell2); applyBorder(cell2);
flag = false; flag = false;
...@@ -440,13 +440,13 @@ public class StatisticsHomepageServiceImpl { ...@@ -440,13 +440,13 @@ public class StatisticsHomepageServiceImpl {
} }
if (flag){ if (flag){
Cell cell3 = firstSheet.getRow(startNum).createCell(41); Cell cell3 = firstSheet.getRow(startNum).createCell(43);
cell3.setCellValue(0); cell3.setCellValue(0);
applyBorder(cell3); applyBorder(cell3);
Cell cell1 = firstSheet.getRow(startNum).createCell(42); Cell cell1 = firstSheet.getRow(startNum).createCell(44);
cell1.setCellValue(0); cell1.setCellValue(0);
applyBorder(cell1); applyBorder(cell1);
Cell cell2 = firstSheet.getRow(startNum).createCell(43); Cell cell2 = firstSheet.getRow(startNum).createCell(45);
cell2.setCellValue(0); cell2.setCellValue(0);
applyBorder(cell2); applyBorder(cell2);
} }
...@@ -476,13 +476,13 @@ public class StatisticsHomepageServiceImpl { ...@@ -476,13 +476,13 @@ public class StatisticsHomepageServiceImpl {
Cell cell2 = row.createCell(2); Cell cell2 = row.createCell(2);
cell2.setCellValue(map.get("regionalCompaniesName").toString()); cell2.setCellValue(map.get("regionalCompaniesName").toString());
applyBorder(cell2); applyBorder(cell2);
Cell cell40= row.createCell(41); Cell cell40= row.createCell(43);
cell40.setCellValue(map.get("yhk").toString()); cell40.setCellValue(map.get("yhk").toString());
applyBorder(cell40); applyBorder(cell40);
Cell cell41 = row.createCell(42); Cell cell41 = row.createCell(44);
cell41.setCellValue(map.get("jnwhk").toString()); cell41.setCellValue(map.get("jnwhk").toString());
applyBorder(cell41); applyBorder(cell41);
Cell cell42 = row.createCell(43); Cell cell42 = row.createCell(45);
cell42.setCellValue(map.get("sywhk").toString()); cell42.setCellValue(map.get("sywhk").toString());
applyBorder(cell42); applyBorder(cell42);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment