admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-12-27 18:37:41 +08:00
parent c0685d1def
commit a5bb140010
3 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyDetail.java
View File

@ -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:月报;8:项目计划;*/
@ApiModelProperty(value="1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;")
/**1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;9:三周(月)滚动计划*/
@ApiModelProperty(value="1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;9:三周(月)滚动计划")
private java.lang.Integer contentType ;
/**内容*/
@ApiModelProperty(value="内容")

4
src/main/java/com/zhgd/xmgl/modules/baotou/entity/ContractorMonthlyPeriod.java
View File

@ -37,7 +37,7 @@ public class ContractorMonthlyPeriod implements Serializable {
@ApiModelProperty(value="企业id")
private java.lang.Long enterpriseId ;
/**1装置（承包商）2项目组*/
@ApiModelProperty(value="1装置（承包商）2项目组")
@ApiModelProperty(value="1装置（承包商）2项目组3项目部")
private java.lang.Integer type ;
/**年份*/
@ApiModelProperty(value="年份")
@ -67,4 +67,6 @@ public class ContractorMonthlyPeriod implements Serializable {
/**状态:1待审批2已驳回3已同意*/
@ApiModelProperty(value="状态:1待审批2已驳回3已同意")
private java.lang.Integer status ;
@ApiModelProperty(value="1月报周报;2三周(月)滚动计划")
private java.lang.Integer menuType ;
}

109
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/ContractorMonthlyDetailServiceImpl.java
View File

@ -677,7 +677,7 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
//获取默认的模版
if (Objects.equals(hasDefault, 1) && StrUtil.isBlank(content)) {
//contentType 1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;
//contentType 1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;9:三周(月)滚动计划
Integer tempType;
if (Objects.equals(contentType, 7)) {
if (Objects.equals(levelType, 1) && Objects.equals(type, 1)) {
@ -689,8 +689,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
} else {
tempType = 13;
}
ContractorMonthlyTemplate template = contractorMonthlyTemplateService.getById(tempType);
content = template.getContent();
} else {
tempType = contentType;
if (contentType == 5 && levelType == 2) {
@ -700,60 +698,63 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
} else if (contentType == 8) {
//项目计划
tempType = 14;
}
ContractorMonthlyTemplate template = contractorMonthlyTemplateService.getById(tempType);
content = template.getContent();
if (Objects.equals(levelType, 2) && contentType <= 4) {
content = content.replace("月", "周");
} else if (Objects.equals(levelType, 1) && contentType <= 4) {
content = content.replace("周", "月");
}
String groupName = "";
String en = info != null ? info.getEnterpriseName() : "xxx";
if (Objects.equals(type, 1)) {
content = content.replace("项目组", "承包商");
groupName = en;
} else {
groupName = group != null ? group.getProjectGroupName() : "xxx";
//三周(月)滚动计划
tempType = 15;
}
String unitName = unit != null ? unit.getDeviceUnitName() : "xxx";
content = content.replace("{{unitName}}", unitName);
content = content.replace("{{groupName}}", groupName);
Date date = new Date();
DateTime s1;
DateTime s2;
if (levelType == 2) {
s1 = DateUtil.offsetWeek(date, -1);
s2 = DateUtil.offsetWeek(date, 1);
content = content.replace("{{lastWeek}}", DateUtil.formatDate(DateUtil.beginOfWeek(s1)) + "~" + DateUtil.formatDate(DateUtil.endOfWeek(s1)));
content = content.replace("{{thisWeek}}", DateUtil.formatDate(DateUtil.beginOfWeek(date)) + "~" + DateUtil.formatDate(DateUtil.endOfWeek(date)));
content = content.replace("{{nextWeek}}", DateUtil.formatDate(DateUtil.beginOfWeek(s2)) + "~" + DateUtil.formatDate(DateUtil.endOfWeek(s2)));
} else {
s1 = DateUtil.offsetMonth(date, -1);
s2 = DateUtil.offsetMonth(date, 1);
content = content.replace("{{lastWeek}}", DateUtil.formatDate(DateUtil.beginOfMonth(s1)) + "~" + DateUtil.formatDate(DateUtil.endOfMonth(s1)));
content = content.replace("{{thisWeek}}", DateUtil.formatDate(DateUtil.beginOfMonth(date)) + "~" + DateUtil.formatDate(DateUtil.endOfMonth(date)));
content = content.replace("{{nextWeek}}", DateUtil.formatDate(DateUtil.beginOfMonth(s2)) + "~" + DateUtil.formatDate(DateUtil.endOfMonth(s2)));
}
content = content.replace("{{enterpriseName}}", en);
}
ContractorMonthlyTemplate template = contractorMonthlyTemplateService.getById(tempType);
content = template.getContent();
if (Objects.equals(levelType, 2) && contentType <= 4) {
content = content.replace("月", "周");
} else if (Objects.equals(levelType, 1) && contentType <= 4) {
content = content.replace("周", "月");
}
String groupName = "";
String en = info != null ? info.getEnterpriseName() : "xxx";
if (Objects.equals(type, 1)) {
content = content.replace("项目组", "承包商");
groupName = en;
} else {
groupName = group != null ? group.getProjectGroupName() : "xxx";
}
String unitName = unit != null ? unit.getDeviceUnitName() : "xxx";
content = content.replace("{{unitName}}", unitName);
content = content.replace("{{groupName}}", groupName);
Date date = new Date();
DateTime s1;
DateTime s2;
if (levelType == 2) {
s1 = DateUtil.offsetWeek(date, -1);
s2 = DateUtil.offsetWeek(date, 1);
content = content.replace("{{lastWeek}}", DateUtil.formatDate(DateUtil.beginOfWeek(s1)) + "~" + DateUtil.formatDate(DateUtil.endOfWeek(s1)));
content = content.replace("{{thisWeek}}", DateUtil.formatDate(DateUtil.beginOfWeek(date)) + "~" + DateUtil.formatDate(DateUtil.endOfWeek(date)));
content = content.replace("{{nextWeek}}", DateUtil.formatDate(DateUtil.beginOfWeek(s2)) + "~" + DateUtil.formatDate(DateUtil.endOfWeek(s2)));
} else {
s1 = DateUtil.offsetMonth(date, -1);
s2 = DateUtil.offsetMonth(date, 1);
content = content.replace("{{lastWeek}}", DateUtil.formatDate(DateUtil.beginOfMonth(s1)) + "~" + DateUtil.formatDate(DateUtil.endOfMonth(s1)));
content = content.replace("{{thisWeek}}", DateUtil.formatDate(DateUtil.beginOfMonth(date)) + "~" + DateUtil.formatDate(DateUtil.endOfMonth(date)));
content = content.replace("{{nextWeek}}", DateUtil.formatDate(DateUtil.beginOfMonth(s2)) + "~" + DateUtil.formatDate(DateUtil.endOfMonth(s2)));
}
content = content.replace("{{enterpriseName}}", en);
//取上周的
if (contentType == 1 || contentType == 2) {
ContractorMonthlyPeriod p1 = contractorMonthlyPeriodService.getBeforePeriod(period);
ContractorMonthlyPeriod beforeP = contractorMonthlyPeriodService.queryByEntity(p1);
if (beforeP != null) {
ContractorMonthlyDetail detail1 = contractorMonthlyDetailMapper.selectOne(new LambdaQueryWrapper<ContractorMonthlyDetail>()
.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);
}
//取上周的
if (contentType == 1 || contentType == 2) {
ContractorMonthlyPeriod p1 = contractorMonthlyPeriodService.getBeforePeriod(period);
ContractorMonthlyPeriod beforeP = contractorMonthlyPeriodService.queryByEntity(p1);
if (beforeP != null) {
ContractorMonthlyDetail detail1 = contractorMonthlyDetailMapper.selectOne(new LambdaQueryWrapper<ContractorMonthlyDetail>()
.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);
}
}
}