diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ContractorMonthlyTitleController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ContractorMonthlyTitleController.java index d40b7aeda..600fb7d38 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ContractorMonthlyTitleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ContractorMonthlyTitleController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.baotou.controller; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -156,8 +157,15 @@ public class ContractorMonthlyTitleController { @PostMapping(value = "/bindList") public Result> bindList(@ApiIgnore @RequestBody HashMap param) { String userId = MapUtils.getString(param, "userId"); - contractorMonthlyConfigService.remove(new LambdaQueryWrapper() - .eq(ContractorMonthlyConfig::getUserId, userId)); + Integer type = MapUtils.getInteger(param, "type"); + List titleIds = contractorMonthlyTitleService.list(new LambdaQueryWrapper() + .eq(ContractorMonthlyTitle::getType, type)).stream().map(ContractorMonthlyTitle::getId).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(titleIds)) { + contractorMonthlyConfigService.remove(new LambdaQueryWrapper() + .in(ContractorMonthlyConfig::getTitleId, titleIds) + .eq(ContractorMonthlyConfig::getUserId, userId) + ); + } JSONArray array = JSONArray.parseArray(JSON.toJSONString(param.get("titleIdList"))); for (int i = 0; i < array.size(); i++) { String s = array.getString(i); diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyDetail.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyDetail.java index 25dd75850..90c6925fd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyDetail.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyDetail.java @@ -30,8 +30,8 @@ public class ContractorMonthlyDetail implements Serializable { /**承包商项自组月报周报计划(word和excel版)id*/ @ApiModelProperty(value="承包商项自组月报周报计划(word和excel版)id") private java.lang.Long periodId ; - /**1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;*/ - @ApiModelProperty(value="1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;") + /**1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;*/ + @ApiModelProperty(value="1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;") private java.lang.Integer contentType ; /**内容*/ @ApiModelProperty(value="内容") diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyQuantity.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyQuantity.java index 0577dd957..739384fa9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyQuantity.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyQuantity.java @@ -51,9 +51,6 @@ public class ContractorMonthlyQuantity implements Serializable { /**更新时间*/ @ApiModelProperty(value="更新时间") private java.util.Date updateTime ; - /**1承包商2项目组**/ - @ApiModelProperty(value="1承包商2项目组") - private java.lang.Integer type ; /**1工程量2计划工程量*/ @ApiModelProperty(value="1工程量2计划工程量") private java.lang.Integer designType; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyTitle.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyTitle.java index f2b4ef7be..af7dd66d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyTitle.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyTitle.java @@ -33,9 +33,6 @@ public class ContractorMonthlyTitle implements Serializable { /**word标题名称*/ @ApiModelProperty(value="word标题名称") private java.lang.String wordName ; - /**所属项目SN*/ - @ApiModelProperty(value="所属项目SN") - private java.lang.String projectSn ; /**父级id*/ @ApiModelProperty(value="父级id") private java.lang.Long parentId ; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeManage.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeManage.java index 735be6856..a91bdf026 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeManage.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeManage.java @@ -51,4 +51,5 @@ public class ProjectHomeManage implements Serializable { /**更新时间*/ @ApiModelProperty(value="更新时间") private java.util.Date updateTime ; + private java.lang.Integer sort ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeWork.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeWork.java index 013cb3525..a7efdb5ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeWork.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectHomeWork.java @@ -57,8 +57,10 @@ public class ProjectHomeWork implements Serializable { /**更新时间*/ @ApiModelProperty(value="更新时间") private java.util.Date updateTime ; + private java.lang.Integer sort ; @TableField(exist = false) @ApiModelProperty(value="操作内容") private List opList; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyDetailServiceImpl.java index 1b1f93040..a60a304bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyDetailServiceImpl.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.baotou.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; @@ -26,7 +27,10 @@ import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.tuple.ImmutableTriple; +import org.apache.commons.lang3.tuple.Triple; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -46,6 +50,7 @@ import java.util.stream.Collectors; */ @Service @Transactional(rollbackFor = Exception.class) +@Slf4j public class ContractorMonthlyDetailServiceImpl extends ServiceImpl implements IContractorMonthlyDetailService { @Autowired private IContractorMonthlyDetailService contractorMonthlyDetailService; @@ -151,6 +156,27 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl m.getJSONObject("body")).map(m -> m.getString("dataStream")).orElse(null); + if (StrUtil.isNotBlank(s)) { + colJo.put("t", 1); + colJo.put("v", s); + } + } + } + } + } + detail.setContent(JSON.toJSONString(rootJo)); + } if (CollUtil.isEmpty(details)) { this.add(detail); } else { @@ -164,7 +190,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl() .eq(ContractorMonthlyQuantity::getPeriodId, p.getId()) - .eq(ContractorMonthlyQuantity::getType, p.getType()) .eq(ContractorMonthlyQuantity::getDesignType, designType) ); ContractorMonthlyDesign design = contractorMonthlyDesignService.getOne(new LambdaQueryWrapper() @@ -209,7 +234,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl param) { String periodId = MapUtils.getString(param, "periodId"); - ContractorMonthlyPeriod p1 = contractorMonthlyPeriodService.getById(periodId); - p1.setStatus(3); - contractorMonthlyPeriodService.updateById(p1); - ProjectGroup group = projectGroupService.getById(p1.getGroupId()); + ContractorMonthlyPeriod ctPeriod = contractorMonthlyPeriodService.getById(periodId); + ctPeriod.setStatus(3); + contractorMonthlyPeriodService.updateById(ctPeriod); + ProjectGroup group = projectGroupService.getById(ctPeriod.getGroupId()); //这个供应商的detail List details1 = contractorMonthlyDetailMapper.selectList(new LambdaQueryWrapper() .eq(ContractorMonthlyDetail::getPeriodId, periodId)); @@ -306,17 +329,17 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl periods = contractorMonthlyPeriodService.list(new LambdaQueryWrapper() .eq(ContractorMonthlyPeriod::getType, 2) .eq(ContractorMonthlyPeriod::getGroupId, gId) .eq(ContractorMonthlyPeriod::getDeviceId, unitId) - .eq(ContractorMonthlyPeriod::getYear, p1.getYear()) - .eq(ContractorMonthlyPeriod::getMonth, p1.getMonth()) - .eq(ContractorMonthlyPeriod::getWhichWeek, p1.getWhichWeek()) - .eq(ContractorMonthlyPeriod::getLevelType, p1.getLevelType()) - .eq(ContractorMonthlyPeriod::getProjectSn, p1.getProjectSn()) + .eq(ContractorMonthlyPeriod::getYear, ctPeriod.getYear()) + .eq(ContractorMonthlyPeriod::getMonth, ctPeriod.getMonth()) + .eq(ContractorMonthlyPeriod::getWhichWeek, ctPeriod.getWhichWeek()) + .eq(ContractorMonthlyPeriod::getLevelType, ctPeriod.getLevelType()) + .eq(ContractorMonthlyPeriod::getProjectSn, ctPeriod.getProjectSn()) ); ContractorMonthlyPeriod period; if (CollUtil.isEmpty(periods)) { @@ -324,10 +347,10 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl designs = contractorMonthlyDesignService.list(new LambdaQueryWrapper() - .eq(ContractorMonthlyDesign::getDeviceId, p1.getDeviceId()) + .eq(ContractorMonthlyDesign::getDeviceId, ctPeriod.getDeviceId()) .eq(ContractorMonthlyDesign::getDesignType, designType) ); if (CollUtil.isNotEmpty(designs)) { @@ -418,24 +442,24 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl quantityList = contractorMonthlyQuantityService.list(new LambdaQueryWrapper() - .eq(ContractorMonthlyQuantity::getPeriodId, p1.getId()) + ContractorMonthlyQuantity quantity = contractorMonthlyQuantityService.getOne(new LambdaQueryWrapper() + .eq(ContractorMonthlyQuantity::getPeriodId, ctPeriod.getId()) .eq(ContractorMonthlyQuantity::getDesignType, designType) ); - if (CollUtil.isNotEmpty(quantityList)) { - Optional op = quantityList.stream().filter(o -> o.getType() == 1).findFirst(); - if (op.isPresent()) { - ContractorMonthlyQuantity cd = this.getGroupQuantity(p1, designType); - Optional op1 = quantityList.stream().filter(o -> o.getType() == 2).findFirst(); - if (op1.isPresent()) { - cd.setId(op1.get().getId()); - cd.setType(2); - contractorMonthlyQuantityService.updateById(cd); - } else { - cd.setId(null); - cd.setType(2); - contractorMonthlyQuantityService.save(cd); - } + if (quantity != null) { + ContractorMonthlyQuantity cd = this.getGroupQuantity(ctPeriod, designType); + ContractorMonthlyQuantity groupQuantity = contractorMonthlyQuantityService.getOne(new LambdaQueryWrapper() + .eq(ContractorMonthlyQuantity::getPeriodId, period.getId()) + .eq(ContractorMonthlyQuantity::getDesignType, designType) + ); + if (groupQuantity != null) { + cd.setId(groupQuantity.getId()); + cd.setPeriodId(period.getId()); + contractorMonthlyQuantityService.updateById(cd); + } else { + cd.setId(null); + cd.setPeriodId(period.getId()); + contractorMonthlyQuantityService.save(cd); } } @@ -451,9 +475,7 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl periodList = contractorMonthlyPeriodService.list(new LambdaQueryWrapper() @@ -463,7 +485,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl quantityList = contractorMonthlyQuantityService.list(new LambdaQueryWrapper() .eq(ContractorMonthlyQuantity::getDesignType, designType) - .eq(ContractorMonthlyQuantity::getType, type) .in(ContractorMonthlyQuantity::getPeriodId, periodList.stream().map(ContractorMonthlyPeriod::getId).collect(Collectors.toList()))); int month = DateUtil.month(new Date()); int year = DateUtil.year(new Date()); @@ -490,81 +511,139 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl addEnterprises = new ArrayList<>(); JSONObject enterpriseRow = toCellDataJo.getJSONObject("4"); - boolean add = true; - Integer addCol = enterpriseRow.size(); - Integer replaceCol = null; for (int col = 3; col < enterpriseRow.size(); col++) { JSONObject jo = enterpriseRow.getJSONObject(col + ""); - if (Objects.equals(jo.getString("v"), addEnterprise)) { - add = false; - replaceCol = col; - } + addEnterprises.add(jo.getString("v")); } - List fromJoList = new ArrayList<>(); - for (int row = 4; row < fromCellDataJo.size(); row++) { - JSONObject jo = fromCellDataJo.getJSONObject(row + ""); - JSONObject jo1 = jo.getJSONObject("3"); - fromJoList.add(jo1); - } - if (add) { - //添加到最后一列 - for (int row = 4; row < toCellDataJo.size(); row++) { - JSONObject jo = toCellDataJo.getJSONObject(row + ""); - jo.put(addCol + "", fromJoList.get(row - 4)); + int colIndex = 0; + for (String addEnterprise : addEnterprises) { + String fromCol = SheetUtils.getIndexOfCol(3 + colIndex++); + //插入一列：columnCount+1，mergeData[].endColumn+1，cellData挪动，columnData（哪行多宽） + boolean add = true; + Integer addCol = enterpriseRow.size(); + Integer replaceCol = null; + for (int col = 3; col < enterpriseRow.size(); col++) { + JSONObject jo = enterpriseRow.getJSONObject(col + ""); + if (Objects.equals(jo.getString("v"), addEnterprise)) { + add = false; + replaceCol = col; + } } - } else { - for (int row = 4; row < toCellDataJo.size(); row++) { - JSONObject jo = toCellDataJo.getJSONObject(row + ""); - jo.put(replaceCol + "", fromJoList.get(row - 4)); + List fromJoList = new ArrayList<>(); + List fromKeyJoList = new ArrayList<>(); + for (int row = 6; row < fromCellDataJo.size(); row++) { + fromJoList.add(SheetUtils.getColJsonObject(fromCellDataJo, row, fromCol + "")); + fromKeyJoList.add(SheetUtils.getColJsonObject(fromCellDataJo, row, "B")); + } + //清空这列 + Integer col = null; + if (add) { + //添加到最后一列 + col = addCol; + } else { + col = replaceCol; + } + for (int i = 6; i < toCellDataJo.size(); i++) { + SheetUtils.setCol(toCellDataJo, i, col, "", 3, 2); + } + SheetUtils.setCol(toCellDataJo, 4, col, addEnterprise, 2, 1); + SheetUtils.setColFunction(toCellDataJo, 5, col, "=SUM(" + SheetUtils.getIndexOfCol(col) + 7 + ":" + SheetUtils.getIndexOfCol(col) + "999)", 3); + for (int i = 0; i < fromKeyJoList.size(); i++) { + JSONObject keyJo = fromKeyJoList.get(i); + JSONObject fromJo = fromJoList.get(i); + boolean done = false; + for (int row = 6; row < toCellDataJo.size(); row++) { + String v = SheetUtils.getColVal(toCellDataJo, row, "B"); + if (Objects.equals(v, keyJo.getString("v"))) { + if (fromJo != null) { + SheetUtils.setCol(toCellDataJo, row, col, fromJo.getString("v"), 3, 2); + } + done = true; + break; + } + } + if (!done) { + //添加到最后一行 + SheetUtils.setCol(toCellDataJo, toCellDataJo.size(), "A", toCellDataJo.size() - 6 + "", 2, 2); + SheetUtils.setCol(toCellDataJo, toCellDataJo.size(), "B", keyJo.getString("v"), 1, 1); + SheetUtils.setColFunction(toCellDataJo, toCellDataJo.size(), "C", "=SUM(C" + (toCellDataJo.size() - 1) + ":XFD" + (toCellDataJo.size() - 1) + ")", 3); + if (fromJo != null) { + SheetUtils.setCol(toCellDataJo, toCellDataJo.size(), col, fromJo.getString("v"), 3, 2); + } + } } } } private void buildToCellDataForOne(JSONObject toCellDataJo, JSONObject fromCellDataJo) { - String addEnterprise = fromCellDataJo.getJSONObject("7").getJSONObject("1").getString("v"); - //key=7开始 - boolean add = true; - int enterpriseNum = 0; - Integer from = null; - Integer to = null; - for (int i = 7; i < toCellDataJo.size(); i++) { - JSONObject jo = toCellDataJo.getJSONObject(i + ""); - if (jo.getJSONObject("1") != null && StrUtil.isNotBlank(jo.getJSONObject("1").getString("v"))) { - if (from != null && to == null) { + List> addEnterprises = new ArrayList<>(); + String lastName = null; + Integer lastBegin = null; + for (int i = 7; i < fromCellDataJo.size(); i++) { + //key=7开始 + String v = SheetUtils.getColVal(fromCellDataJo, i, "B"); + if (StrUtil.isNotBlank(v)) { + if (lastName != null) { + Triple t = new ImmutableTriple<>(lastName, lastBegin, i - 1); + addEnterprises.add(t); + } + lastName = v; + lastBegin = i; + } + if (i == fromCellDataJo.size() - 1) { + Triple t = new ImmutableTriple<>(lastName, lastBegin, i); + addEnterprises.add(t); + } + } + for (Triple triple : addEnterprises) { + String addEnterprise = triple.getLeft(); + Integer begin = triple.getMiddle(); + Integer end = triple.getRight(); + boolean add = true; + int enterpriseNum = 0; + Integer from = null; + Integer to = null; + for (int i = 7; i < toCellDataJo.size(); i++) { + JSONObject jo = toCellDataJo.getJSONObject(i + ""); + if (jo != null && jo.getJSONObject("1") != null && StrUtil.isNotBlank(jo.getJSONObject("1").getString("v"))) { + if (from != null && to == null) { + to = i - 1; + } + enterpriseNum++; + } + if (jo != null && jo.getJSONObject("1") != null && Objects.equals(addEnterprise, jo.getJSONObject("1").getString("v"))) { + //覆盖 + from = i; + add = false; + } + if (toCellDataJo.size() - 1 == i && from != null && to == null) { to = i - 1; } - enterpriseNum++; } - if (jo.getJSONObject("1") != null && Objects.equals(addEnterprise, jo.getJSONObject("1").getString("v"))) { - //覆盖 - from = i; - add = false; + JSONObject fromJo = new JSONObject(); + for (int i = begin; i <= end; i++) { + JSONObject jo = fromCellDataJo.getJSONObject(i + ""); + if (add) { + String cn = NumberUtils.int2chineseNum(enterpriseNum + 1); + JSONObject jo1 = jo.getJSONObject("0"); + jo1.put("v", cn); + break; + } } - if (toCellDataJo.size() - 1 == i && from != null && to == null) { - to = i - 1; + int j = 0; + for (int i = begin; i <= end; i++) { + JSONObject jo = fromCellDataJo.getJSONObject(i + ""); + fromJo.put(j++ + "", jo); } - } - JSONObject fromJo = new JSONObject(); - int j = 0; - boolean run = false; - for (int i = 7; i < fromCellDataJo.size(); i++) { - JSONObject jo = fromCellDataJo.getJSONObject(i + ""); - if (add && !run) { - String cn = NumberUtils.int2chineseNum(enterpriseNum + 1); - JSONObject jo1 = jo.getJSONObject("0"); - jo1.put("v", cn); - run = true; + if (add) { + SheetUtils.addRows(fromJo, toCellDataJo); + } else { + SheetUtils.replaceRows(fromJo, toCellDataJo, from, to); } - fromJo.put(j++ + "", jo); - } - if (add) { - SheetUtils.addRows(fromJo, toCellDataJo); - } else { - SheetUtils.replaceRows(fromJo, toCellDataJo, from, to); } } @@ -608,6 +687,9 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl() - .eq(ContractorMonthlyDetail::getContentType, contentType) - .eq(ContractorMonthlyDetail::getPeriodId, beforeP.getId())); - if (detail1 != null) { - JSONObject toJo = JSON.parseObject(content); - JSONObject toCellDataJo = getCellData(toJo); - JSONObject fromCellDataJo = getCellData(JSON.parseObject(detail1.getContent())); - int fl = SheetUtils.getColDataLength(fromCellDataJo, 8, 5); - int tl = SheetUtils.getColDataLength(toCellDataJo, 8, 5); - SheetUtils.replaceArea(fromCellDataJo, toCellDataJo, 8, 5, fl + 7, 7, 8, 2, tl + 7, 4); - content = JSON.toJSONString(toJo); + if (contentType == 1 || contentType == 2) { + ContractorMonthlyPeriod p1 = contractorMonthlyPeriodService.getBeforePeriod(period); + ContractorMonthlyPeriod beforeP = contractorMonthlyPeriodService.queryByEntity(p1); + if (beforeP != null) { + ContractorMonthlyDetail detail1 = contractorMonthlyDetailMapper.selectOne(new LambdaQueryWrapper() + .eq(ContractorMonthlyDetail::getContentType, contentType) + .eq(ContractorMonthlyDetail::getPeriodId, beforeP.getId())); + if (detail1 != null) { + JSONObject toJo = JSON.parseObject(content); + JSONObject toCellDataJo = getCellData(toJo); + JSONObject fromCellDataJo = getCellData(JSON.parseObject(detail1.getContent())); + int fl = SheetUtils.getColDataLength(fromCellDataJo, 8, 5); + int tl = SheetUtils.getColDataLength(toCellDataJo, 8, 5); + SheetUtils.replaceAreaForQuantity(fromCellDataJo, toCellDataJo, 8, 5, fl + 7, 7, 8, 2, tl + 7, 4); + content = JSON.toJSONString(toJo); + } } } } @@ -663,11 +747,12 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl titleIds = contractorMonthlyConfigService.list(new LambdaQueryWrapper() .eq(ContractorMonthlyConfig::getUserId, SecurityUtils.getUser().getUserId())).stream().map(ContractorMonthlyConfig::getTitleId).collect(Collectors.toList()); if (CollUtil.isNotEmpty(titleIds)) { - Map titleMap = contractorMonthlyTitleService.list(new LambdaQueryWrapper() + List titles = contractorMonthlyTitleService.list(new LambdaQueryWrapper() .eq(ContractorMonthlyTitle::getType, levelType) .in(ContractorMonthlyTitle::getId, titleIds) - ).stream().map(o -> { - o.setWordName(o.getWordName().replace(" ", "")); + ); + Map titleMap = titles.stream().map(o -> { + o.setWordName(o.getWordName().replace(" ", "").replaceAll("\\u00A0+", "")); return o; }).collect(Collectors.toMap(ContractorMonthlyTitle::getWordName, Function.identity(), (o, o2) -> o)); JSONObject rootJo = JSON.parseObject(content); @@ -704,6 +789,11 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl greens = new ArrayList<>(); JSONObject toCellDataJo = getCellData(toJo); + for (int i = 3; i < toCellDataJo.size(); i++) { + String v = Optional.ofNullable(toCellDataJo.getJSONObject(i + "")).map(m -> m.getJSONObject("0")).map(m -> m.getString("v")).orElse(null); + if (StrUtil.isNotBlank(v)) { + greens.add(i); + } + } //设计总量 ContractorMonthlyDesign design = contractorMonthlyDesignService.getOne(new LambdaQueryWrapper() .eq(ContractorMonthlyDesign::getDeviceId, deviceId) @@ -736,17 +833,17 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl list = JSON.parseObject(design.getQuantity(), new TypeReference>() { }); - SheetUtils.setColDataList(toCellDataJo, 3, "C", list); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "C", list, greens); } //查询所有的period List periodList = contractorMonthlyPeriodService.list(new LambdaQueryWrapper() .eq(ContractorMonthlyPeriod::getDeviceId, deviceId) .eq(ContractorMonthlyPeriod::getGroupId, groupId) + .eq(ContractorMonthlyPeriod::getType, type) .eq(type == 1, ContractorMonthlyPeriod::getEnterpriseId, enterpriseId) ); if (CollUtil.isNotEmpty(periodList)) { List quantityList = contractorMonthlyQuantityService.list(new LambdaQueryWrapper() - .eq(ContractorMonthlyQuantity::getType, type) .eq(ContractorMonthlyQuantity::getDesignType, designType) .in(ContractorMonthlyQuantity::getPeriodId, periodList.stream().map(ContractorMonthlyPeriod::getId).collect(Collectors.toList()))); Optional op = quantityList.stream().filter(o -> Objects.equals(o.getPeriodId(), periodId)).collect(Collectors.toList()).stream().findAny(); @@ -759,47 +856,47 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl pids1 = periodList.stream().filter(o -> isLessOrEqual(o, year, month, whichWeek)).map(ContractorMonthlyPeriod::getId).collect(Collectors.toList()); List months = quantityList.stream().filter(o -> pids1.contains(o.getPeriodId())).map(ContractorMonthlyQuantity::getWeekQuantity).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "E", this.sumListJson(months)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "E", this.sumListJson(months), greens); //本年累计完成量 List pids2 = periodList.stream().filter(o -> isLessOrEqual(o, year, month, whichWeek)).map(ContractorMonthlyPeriod::getId).collect(Collectors.toList()); List years = quantityList.stream().filter(o -> pids2.contains(o.getPeriodId())).map(ContractorMonthlyQuantity::getWeekQuantity).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "F", this.sumListJson(years)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "F", this.sumListJson(years), greens); //开累完成量 List alls = quantityList.stream().map(ContractorMonthlyQuantity::getWeekQuantity).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "G", this.sumListJson(alls)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "G", this.sumListJson(alls), greens); //本期到货 String arriveGoods = quantity.getArriveGoods(); - SheetUtils.setColDataList(toCellDataJo, 3, "H", arriveGoods); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "H", arriveGoods, greens); //累计到货 List arriveAlls = quantityList.stream().map(ContractorMonthlyQuantity::getArriveGoods).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "I", this.sumListJson(arriveAlls)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "I", this.sumListJson(arriveAlls), greens); //备注 String remarks = quantity.getRemarks(); - SheetUtils.setColDataList(toCellDataJo, 3, "J", remarks); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "J", remarks, greens); } else { //月 //本月完成量 - SheetUtils.setColDataList(toCellDataJo, 3, "D", quantity.getMonthQuantity()); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "D", quantity.getMonthQuantity(), greens); //本年累计完成量 List pids2 = periodList.stream().filter(o -> isLessOrEqual(o, year, month, whichWeek)).map(ContractorMonthlyPeriod::getId).collect(Collectors.toList()); List years = quantityList.stream().filter(o -> pids2.contains(o.getPeriodId())).map(ContractorMonthlyQuantity::getMonthQuantity).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "E", this.sumListJson(years)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "E", this.sumListJson(years), greens); //开累完成量 List alls = quantityList.stream().map(ContractorMonthlyQuantity::getMonthQuantity).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "F", this.sumListJson(alls)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "F", this.sumListJson(alls), greens); //本期到货 String arriveGoods = quantity.getArriveGoods(); - SheetUtils.setColDataList(toCellDataJo, 3, "G", arriveGoods); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "G", arriveGoods, greens); //累计到货 List arriveAlls = quantityList.stream().map(ContractorMonthlyQuantity::getArriveGoods).collect(Collectors.toList()); - SheetUtils.setColDataList(toCellDataJo, 3, "H", this.sumListJson(arriveAlls)); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "H", this.sumListJson(arriveAlls), greens); //备注 String remarks = quantity.getRemarks(); - SheetUtils.setColDataList(toCellDataJo, 3, "I", remarks); + SheetUtils.setColDataListForQuantity(toCellDataJo, 3, "I", remarks, greens); } } } @@ -882,7 +979,7 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl= levels.indexOf(level1)) { + if (levels.contains(level1) /*&& levels.indexOf(level) >= levels.indexOf(level1)*/) { needRead = false; + //补充换行 + String str = Convert.toStr(jo.get("value")); + if (!str.contains("\n") && !str.contains("\r\n")) { + newMainJa.add(new JoBuilder().put("value", "\n").build()); + } newMainJa.add(jo); } } else { diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyTitleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyTitleServiceImpl.java index 525cfaf2f..206d3ddba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyTitleServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyTitleServiceImpl.java @@ -48,7 +48,7 @@ public class ContractorMonthlyTitleServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ContractorMonthlyTitle.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(ContractorMonthlyTitle::getId)); + queryWrapper.orderByAsc(RefUtil.fieldNameUlc(ContractorMonthlyTitle::getSort)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeManageServiceImpl.java index 9e50f95c9..20684d3db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeManageServiceImpl.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.baotou.service.impl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeManage; +import com.zhgd.xmgl.modules.baotou.entity.ProjectHomeWork; import com.zhgd.xmgl.modules.baotou.mapper.ProjectHomeManageMapper; import com.zhgd.xmgl.modules.baotou.service.IProjectHomeManageService; import org.springframework.stereotype.Service; @@ -44,7 +45,7 @@ public class ProjectHomeManageServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectHomeManage.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(ProjectHomeManage::getId)); + queryWrapper.orderByAsc(RefUtil.fieldNameUlc(ProjectHomeManage::getSort)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeWorkServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeWorkServiceImpl.java index 5c5864f82..e1cd46c58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeWorkServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ProjectHomeWorkServiceImpl.java @@ -49,7 +49,7 @@ public class ProjectHomeWorkServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectHomeWork.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(ProjectHomeWork::getId)); + queryWrapper.orderByAsc(RefUtil.fieldNameUlc(ProjectHomeWork::getSort)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/util/SheetUtils.java b/src/main/java/com/zhgd/xmgl/util/SheetUtils.java index f89d40030..42826e211 100644 --- a/src/main/java/com/zhgd/xmgl/util/SheetUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/SheetUtils.java @@ -9,8 +9,19 @@ import com.gexin.fastjson.TypeReference; import java.util.*; public class SheetUtils { - - static List letterList = Arrays.asList("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"); + /** + * 居中和加边框 + */ + static String centerStyle = "cwv4pm"; + /** + * 靠右对齐和加边框 + */ + static String rightStyle = "cyqt7m"; + static String leftStyle = "poyh2f"; + /** + * 绿色工程量 + */ + static String greenQuantityStyle = "uh17gs"; public static JSONObject addRows(JSONObject fromJo, JSONObject toJo) { for (int i = 0; i < fromJo.size(); i++) { @@ -100,6 +111,39 @@ public class SheetUtils { return add; } + public static JSONObject replaceAreaForQuantity(JSONObject fromCellDataJo, JSONObject toCellDataJo, int i1, int i2, int i3, int i4, int j1, int j2, int j3, int j4) { + JSONObject add = BeanUtil.toBean(toCellDataJo, JSONObject.class); + //是否扩容 + int diffCol = i4 - i2 - (j4 - j2); + int diffRow = i3 - i1 - (j3 - j1); + for (int row = 0; row < toCellDataJo.size(); row++) { + JSONObject jo = toCellDataJo.getJSONObject(row + ""); + JSONObject nr = new JSONObject(); + for (int col = 0; col < jo.size(); col++) { + nr.put(col + "", jo.getJSONObject(col + "")); + } + if (diffRow > 0 && row > j3) { + add.put(row + diffRow + "", nr); + } else { + add.put(row + "", nr); + } + } + int fromRow = i1; + for (int row = j1; row <= j3; row++) { + int fromCol = i2; + JSONObject nr = add.getJSONObject(row + ""); + for (int col = j2; col <= j4; col++) { + nr.put(col + "", fromCellDataJo.getJSONObject(fromRow + "").getJSONObject(fromCol + "")); + fromCol++; + } + fromRow++; + add.put(row + "", nr); + } + toCellDataJo.clear(); + toCellDataJo.putAll(add); + return add; + } + /** * 获取col连续不为空的数量 * @@ -125,7 +169,33 @@ public class SheetUtils { } public static String getColNum(String col) { - return letterList.indexOf(col) + ""; + char[] chars = col.toCharArray(); + int res = 0; + for (char c : chars) { + res = res * 26 + (c - 'A' + 1); + } + return res - 1 + ""; + } + + /** + * description: 列号从1开始，如：0 对应 A列，26对应AA列 + * + * @param value Excel列号 + */ + public static String getIndexOfCol(int value) { + // 转26进制 0-25 + int calculateValue = value; + // 取高位 + int high = calculateValue / 26; + // 取低位 + int low = calculateValue % 26; + // 低位可直接取出对应的字母 + String transStr = String.valueOf((char) (low + 65)); + if (high > 0) { + // 高位递归取出字母 + transStr = getIndexOfCol(high) + transStr; + } + return transStr; } /** @@ -151,13 +221,34 @@ public class SheetUtils { */ public static List getColDataList(JSONObject cellData, int row, String col, int length) { List list = new ArrayList<>(); - for (int r = row; r < length; r++) { + for (int r = row; r < length + row; r++) { JSONObject jo = cellData.getJSONObject(r + ""); list.add(Optional.ofNullable(jo.getJSONObject(getColNum(col))).map(m -> m.getString("v")).orElse(null)); } return list; } + public static void setColDataListForQuantity(JSONObject toCellDataJo, int row, String col, List addList, List greens) { + for (int r = row; r < row + addList.size(); r++) { + JSONObject jo = toCellDataJo.getJSONObject(r + ""); + Map map = new MapBuilder().put("v", addList.get(r - row)).put("t", 2).build(); + if (greens.contains(r)) { + map.put("s", greenQuantityStyle); + } else { + map.put("s", centerStyle); + } + if (jo != null) { + jo.put(getColNum(col), map); + } + } + } + + public static void setColDataListForQuantity(JSONObject toCellDataJo, int row, String col, String jsonStr, List greens) { + List addList = JSON.parseObject(jsonStr, new TypeReference>() { + }); + setColDataListForQuantity(toCellDataJo, row, col, addList, greens); + } + public static void setColDataList(JSONObject toCellDataJo, int row, String col, List addList) { for (int r = row; r < row + addList.size(); r++) { JSONObject jo = toCellDataJo.getJSONObject(r + ""); @@ -167,9 +258,179 @@ public class SheetUtils { } public static void setColDataList(JSONObject toCellDataJo, int row, String col, String jsonStr) { - List addList = JSON.parseObject(jsonStr,new TypeReference>(){}); + List addList = JSON.parseObject(jsonStr, new TypeReference>() { + }); setColDataList(toCellDataJo, row, col, addList); } + /** + * 获取val + */ + public static String getColVal(JSONObject cellData, int row, String d) { + return Optional.ofNullable(cellData.getJSONObject(row + "")).map(m -> m.getJSONObject(getColNum(d))).map(m -> m.getString("v")).orElse(null); + } + public static JSONObject getColJsonObject(JSONObject cellData, int row, String col) { + return Optional.ofNullable(cellData.getJSONObject(row + "")).map(m -> m.getJSONObject(getColNum(col))).orElse(null); + } + + public static void setCol(JSONObject cellData, int row, String col, String v, int center, int t) { + setCol(cellData, row, Integer.parseInt(getColNum(col)), v, center, t); + } + + /** + * @param cellData + * @param row + * @param col + * @param v + * @param center + * @param t 1 表示字符串，2 表示数字，3 表示布尔值，4 表示强制文本 + */ + public static void setCol(JSONObject cellData, int row, int col, String v, int center, int t) { + cellData.putIfAbsent(row + "", new JoBuilder().build()); + String s; + if (Objects.equals(center, 1)) { + s = leftStyle; + } else if (Objects.equals(center, 3)) { + s = rightStyle; + } else { + s = centerStyle; + } + cellData.getJSONObject(row + "").put(col + "", new JoBuilder().put("s", s).put("t", t).put("v", v).build()); + } + + /** + * @param cellData + * @param row + * @param col + * @param v + * @param center 1左 2中 3右 + */ + public static void setColFunction(JSONObject cellData, int row, int col, String v, int center) { + cellData.putIfAbsent(row + "", new JoBuilder().build()); + String s; + if (Objects.equals(center, 1)) { + s = leftStyle; + } else if (Objects.equals(center, 3)) { + s = rightStyle; + } else { + s = centerStyle; + } + cellData.getJSONObject(row + "").put(col + "", new JoBuilder().put("s", s).put("t", 2).put("f", v).build()); + } + + public static void setColFunction(JSONObject cellData, int row, String col, String v, int center) { + setColFunction(cellData, row, Integer.parseInt(getColNum(col)), v, center); + } + + /** + * 设置默认样式 + * + * @param rootJo + */ + public static void setDefaultStyle(JSONObject rootJo) { + JSONObject styles = rootJo.getJSONObject("styles"); + styles.put(leftStyle, JSON.parseObject(getStyle(1))); + styles.put(centerStyle, JSON.parseObject(getStyle(2))); + styles.put(rightStyle, JSON.parseObject(getStyle(3))); + String gs = "{\n" + + " \"ff\": \"Arial\",\n" + + " \"fs\": 11,\n" + + " \"it\": 0,\n" + + " \"bl\": 0,\n" + + " \"ul\": {\n" + + " \"s\": 0,\n" + + " \"cl\": {\n" + + " \"rgb\": \"rgb(0,0,0)\"\n" + + " }\n" + + " },\n" + + " \"st\": {\n" + + " \"s\": 0,\n" + + " \"cl\": {\n" + + " \"rgb\": \"rgb(0,0,0)\"\n" + + " }\n" + + " },\n" + + " \"ol\": {\n" + + " \"s\": 0,\n" + + " \"cl\": {\n" + + " \"rgb\": \"rgb(0,0,0)\"\n" + + " }\n" + + " },\n" + + " \"tr\": {\n" + + " \"a\": 0,\n" + + " \"v\": 0\n" + + " },\n" + + " \"td\": 0,\n" + + " \"cl\": {\n" + + " \"rgb\": \"rgb(0,0,0)\"\n" + + " },\n" + + " \"bg\": {\n" + + " \"rgb\": \"rgb(204,255,204)\"\n" + + " },\n" + + " \"ht\": 2,\n" + + " \"vt\": 2,\n" + + " \"tb\": 3,\n" + + " \"pd\": {\n" + + " \"t\": 0,\n" + + " \"b\": 2,\n" + + " \"l\": 2,\n" + + " \"r\": 2\n" + + " },\n" + + " \"bd\": {\n" + + " \"r\": {\n" + + " \"cl\": {\n" + + " \"rgb\": \"rgb(0,0,0)\"\n" + + " },\n" + + " \"s\": 1\n" + + " },\n" + + " \"b\": {\n" + + " \"cl\": {\n" + + " \"rgb\": \"rgb(0,0,0)\"\n" + + " },\n" + + " \"s\": 1\n" + + " }\n" + + " }\n" + + "}"; + styles.put(greenQuantityStyle, JSON.parseObject(gs)); + } + + /** + * 有边框和居中、靠右对齐等 + * + * @param ht + * @return + */ + private static String getStyle(int ht) { + String s = "{\n" + + " \"bd\": {\n" + + " \"t\": {\n" + + " \"s\": 1,\n" + + " \"cl\": {\n" + + " \"rgb\": \"#000000\"\n" + + " }\n" + + " },\n" + + " \"b\": {\n" + + " \"s\": 1,\n" + + " \"cl\": {\n" + + " \"rgb\": \"#000000\"\n" + + " }\n" + + " },\n" + + " \"l\": {\n" + + " \"s\": 1,\n" + + " \"cl\": {\n" + + " \"rgb\": \"#000000\"\n" + + " }\n" + + " },\n" + + " \"r\": {\n" + + " \"s\": 1,\n" + + " \"cl\": {\n" + + " \"rgb\": \"#000000\"\n" + + " }\n" + + " }\n" + + " },\n" + + " \"ht\": " + ht + ",\n" + + "\"vt\": 2" + + "}"; + return s; + } }