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*/ /**承包商项自组月报周报计划(word和excel版)id*/
@ApiModelProperty(value="承包商项自组月报周报计划(word和excel版)id") @ApiModelProperty(value="承包商项自组月报周报计划(word和excel版)id")
private java.lang.Long periodId ; private java.lang.Long periodId ;
/**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:项目计划;") @ApiModelProperty(value="1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;9:三周(月)滚动计划")
private java.lang.Integer contentType ; private java.lang.Integer contentType ;
/**内容*/ /**内容*/
@ApiModelProperty(value="内容") @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") @ApiModelProperty(value="企业id")
private java.lang.Long enterpriseId ; private java.lang.Long enterpriseId ;
/**1装置（承包商）2项目组*/ /**1装置（承包商）2项目组*/
@ApiModelProperty(value="1装置（承包商）2项目组") @ApiModelProperty(value="1装置（承包商）2项目组3项目部")
private java.lang.Integer type ; private java.lang.Integer type ;
/**年份*/ /**年份*/
@ApiModelProperty(value="年份") @ApiModelProperty(value="年份")
@ -67,4 +67,6 @@ public class ContractorMonthlyPeriod implements Serializable {
/**状态:1待审批2已驳回3已同意*/ /**状态:1待审批2已驳回3已同意*/
@ApiModelProperty(value="状态:1待审批2已驳回3已同意") @ApiModelProperty(value="状态:1待审批2已驳回3已同意")
private java.lang.Integer status ; private java.lang.Integer status ;
@ApiModelProperty(value="1月报周报;2三周(月)滚动计划")
private java.lang.Integer menuType ;
} }

9
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)) { 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; Integer tempType;
if (Objects.equals(contentType, 7)) { if (Objects.equals(contentType, 7)) {
if (Objects.equals(levelType, 1) && Objects.equals(type, 1)) { if (Objects.equals(levelType, 1) && Objects.equals(type, 1)) {
@ -689,8 +689,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
} else { } else {
tempType = 13; tempType = 13;
} }
ContractorMonthlyTemplate template = contractorMonthlyTemplateService.getById(tempType);
content = template.getContent();
} else { } else {
tempType = contentType; tempType = contentType;
if (contentType == 5 && levelType == 2) { if (contentType == 5 && levelType == 2) {
@ -700,6 +698,10 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
} else if (contentType == 8) { } else if (contentType == 8) {
//项目计划 //项目计划
tempType = 14; tempType = 14;
} else {
//三周(月)滚动计划
tempType = 15;
}
} }
ContractorMonthlyTemplate template = contractorMonthlyTemplateService.getById(tempType); ContractorMonthlyTemplate template = contractorMonthlyTemplateService.getById(tempType);
content = template.getContent(); content = template.getContent();
@ -757,7 +759,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
} }
} }
} }
}
//设置工程量的本周月等的量 //设置工程量的本周月等的量
if (Objects.equals(contentType, 5) || Objects.equals(contentType, 6)) { if (Objects.equals(contentType, 5) || Objects.equals(contentType, 6)) {