ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

11-26-1

tiaosheng
Lihong@123456 5 years ago
parent
e8032c6431
commit
19ada2817f
2 changed files with 19 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  2. 5
      mt/src/main/resources/mapper_dao/CompeteScoreDao.xml

34
mt/src/main/java/com/ccsens/mt/service/ExcelService.java
View File

@ -863,21 +863,25 @@ public class ExcelService implements IExcelService {
}
list.add(cells);
}
//
// if (competeAllCount.getProjectId()==2026){
// cells = new ArrayList<>();
// PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell();
// poiUtilCel.setValue("--");
// cells.add(poiUtilCel);
// PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell();
// poiUtilCel1.setValue("合计");
// cells.add(poiUtilCel1);
// PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(3 + "", 15, 1, 300, 18);
// poiUtilCel2.setValue("");
// poiUtilCel2.setFunction("sum(C8:C16)");
// cells.add(poiUtilCel2);
// list.add(cells);
// }
if (competeAllCount.getProjectId()==2026){
cells = new ArrayList<>();
PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell();
poiUtilCel.setValue("--");
cells.add(poiUtilCel);
PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell();
poiUtilCel1.setValue("合计");
cells.add(poiUtilCel1);
PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(3 + "", 15, 1, 300, 18);
poiUtilCel2.setValue("");
poiUtilCel2.setFunction("sum(C10:C18)");
cells.add(poiUtilCel2);
PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell();
poiUtilCel3.setValue("");
poiUtilCel3.setFunction("sum(R2:C19)");
cells.add(poiUtilCel3);
list.add(cells);
}

5
mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
View File

@ -743,13 +743,8 @@
IF
(
(
<<<<<<< HEAD
( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0) )
OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) )
=======
( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) )
OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) )
>>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a
),
1,
0

Write Preview
Loading…
Cancel
Save