包头bug修改
This commit is contained in:
parent
a5bb140010
commit
c74d1b4163
@ -81,6 +81,23 @@ public class ConstructionProjectQualityPrevention implements Serializable {
|
||||
@ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime ;
|
||||
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
@ApiModelProperty(value="施工单位技术负责人")
|
||||
private java.lang.Long constructionUnitTechnicalPerson ;
|
||||
@ApiModelProperty(value="EPC专业工程师")
|
||||
private java.lang.Long epcProfessionalEngineer ;
|
||||
@ApiModelProperty(value="EPC技术负责人")
|
||||
private java.lang.Long epcTechnicalPersonInCharge ;
|
||||
@ApiModelProperty(value="监理专业工程师")
|
||||
private java.lang.Long supervisionProfessionalEngineer ;
|
||||
@ApiModelProperty(value="总监(总代)")
|
||||
private java.lang.Long directorGeneralAgent ;
|
||||
@ApiModelProperty(value="项目组专业工程师")
|
||||
private java.lang.Long projectTeamProfessionalEngineer ;
|
||||
@ApiModelProperty(value="项目经理(或施工经理)")
|
||||
private java.lang.Long projectManager ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置/单元工程名称")
|
||||
private java.lang.String deviceUnitProjectName ;
|
||||
@ -96,4 +113,26 @@ public class ConstructionProjectQualityPrevention implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="技术负责人名称")
|
||||
private java.lang.String technicalPersonInChargeName ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位技术负责人名称")
|
||||
private java.lang.String constructionUnitTechnicalPersonName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC专业工程师名称")
|
||||
private java.lang.String epcProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC技术负责人名称")
|
||||
private java.lang.String epcTechnicalPersonInChargeName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理专业工程师名称")
|
||||
private java.lang.String supervisionProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="总监(总代)名称")
|
||||
private java.lang.String directorGeneralAgentName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组专业工程师名称")
|
||||
private java.lang.String projectTeamProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目经理(或施工经理)名称")
|
||||
private java.lang.String projectManagerName ;
|
||||
}
|
||||
|
||||
@ -30,8 +30,8 @@ public class ProjectHomeNotice implements Serializable {
|
||||
/**所属项目SN*/
|
||||
@ApiModelProperty(value="所属项目SN")
|
||||
private java.lang.String projectSn ;
|
||||
/**1人员2安全3质量4进度5施工6党建*/
|
||||
@ApiModelProperty(value="1人员2安全3质量4进度5施工6党建")
|
||||
/**1人员2安全3质量4进度5施工6党建7质量监督通知公告*/
|
||||
@ApiModelProperty(value="1人员2安全3质量4进度5施工6党建7质量监督通知公告")
|
||||
private java.lang.Integer whichModule ;
|
||||
/**标题*/
|
||||
@ApiModelProperty(value="标题")
|
||||
@ -39,6 +39,8 @@ public class ProjectHomeNotice implements Serializable {
|
||||
/**内容*/
|
||||
@ApiModelProperty(value="内容")
|
||||
private java.lang.String content ;
|
||||
@ApiModelProperty(value="附件url")
|
||||
private java.lang.String fileUrl ;
|
||||
/**创建时间*/
|
||||
@ApiModelProperty(value="创建时间")
|
||||
private java.util.Date createTime ;
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.ConstructionProjectQualityPreventionMapper">
|
||||
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.ConstructionProjectQualityPrevention">
|
||||
select * from (
|
||||
select t.*
|
||||
@ -8,12 +9,26 @@
|
||||
,su1.real_name as compilation_name
|
||||
,su2.real_name as approval_name
|
||||
,su3.real_name as technical_person_in_charge_name
|
||||
,su4.real_name as construction_unit_technical_person_name
|
||||
,su5.real_name as epc_professional_engineer_name
|
||||
,su6.real_name as epc_technical_person_in_charge_name
|
||||
,su7.real_name as supervision_professional_engineer_name
|
||||
,su8.real_name as director_general_agent_name
|
||||
,su9.real_name as project_team_professional_engineer_name
|
||||
,su10.real_name as project_manager_name
|
||||
,ei1.enterprise_name as construction_contractor_name
|
||||
from construction_project_quality_prevention t
|
||||
left join device_unit du on du.id=t.device_unit_project
|
||||
left join system_user su1 on su1.user_id=t.compilation
|
||||
left join system_user su2 on su2.user_id=t.approval
|
||||
left join system_user su3 on su3.user_id=t.technical_person_in_charge
|
||||
left join system_user su4 on su4.user_id=t.construction_unit_technical_person
|
||||
left join system_user su5 on su5.user_id=t.epc_professional_engineer
|
||||
left join system_user su6 on su6.user_id=t.epc_technical_person_in_charge
|
||||
left join system_user su7 on su7.user_id=t.supervision_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.director_general_agent
|
||||
left join system_user su9 on su9.user_id=t.project_team_professional_engineer
|
||||
left join system_user su10 on su10.user_id=t.project_manager
|
||||
left join enterprise_info ei1 on ei1.id=t.construction_contractor
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
@ -25,12 +40,26 @@
|
||||
,su1.real_name as compilation_name
|
||||
,su2.real_name as approval_name
|
||||
,su3.real_name as technical_person_in_charge_name
|
||||
,su4.real_name as construction_unit_technical_person_name
|
||||
,su5.real_name as epc_professional_engineer_name
|
||||
,su6.real_name as epc_technical_person_in_charge_name
|
||||
,su7.real_name as supervision_professional_engineer_name
|
||||
,su8.real_name as director_general_agent_name
|
||||
,su9.real_name as project_team_professional_engineer_name
|
||||
,su10.real_name as project_manager_name
|
||||
,ei1.enterprise_name as construction_contractor_name
|
||||
from construction_project_quality_prevention t
|
||||
left join device_unit du on du.id=t.device_unit_project
|
||||
left join system_user su1 on su1.user_id=t.compilation
|
||||
left join system_user su2 on su2.user_id=t.approval
|
||||
left join system_user su3 on su3.user_id=t.technical_person_in_charge
|
||||
left join system_user su4 on su4.user_id=t.construction_unit_technical_person
|
||||
left join system_user su5 on su5.user_id=t.epc_professional_engineer
|
||||
left join system_user su6 on su6.user_id=t.epc_technical_person_in_charge
|
||||
left join system_user su7 on su7.user_id=t.supervision_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.director_general_agent
|
||||
left join system_user su9 on su9.user_id=t.project_team_professional_engineer
|
||||
left join system_user su10 on su10.user_id=t.project_manager
|
||||
left join enterprise_info ei1 on ei1.id=t.construction_contractor
|
||||
)t
|
||||
where t.id = #{id}
|
||||
|
||||
@ -105,6 +105,14 @@ public class ConstructionProjectQualityPreventionServiceImpl extends ServiceImpl
|
||||
e.setOperationTeamInvolved(FlowUtil.getString(map,"operationTeamInvolved"));
|
||||
e.setDetailedList(FlowUtil.getJSONString(map,"detailedList"));
|
||||
e.setSelectDetailedList(FlowUtil.getJSONString(map,"selectDetailedList"));
|
||||
e.setContractModel(FlowUtil.getPullDownInteger(map,"contractModel"));
|
||||
e.setConstructionUnitTechnicalPerson(FlowUtil.getPullDownLong(map,"constructionUnitTechnicalPerson"));
|
||||
e.setEpcProfessionalEngineer(FlowUtil.getPullDownLong(map,"epcProfessionalEngineer"));
|
||||
e.setEpcTechnicalPersonInCharge(FlowUtil.getPullDownLong(map,"epcTechnicalPersonInCharge"));
|
||||
e.setSupervisionProfessionalEngineer(FlowUtil.getPullDownLong(map,"supervisionProfessionalEngineer"));
|
||||
e.setDirectorGeneralAgent(FlowUtil.getPullDownLong(map,"directorGeneralAgent"));
|
||||
e.setProjectTeamProfessionalEngineer(FlowUtil.getPullDownLong(map,"projectTeamProfessionalEngineer"));
|
||||
e.setProjectManager(FlowUtil.getPullDownLong(map,"projectManager"));
|
||||
baseMapper.insert(e);
|
||||
}
|
||||
|
||||
|
||||
@ -678,7 +678,7 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
|
||||
//获取默认的模版
|
||||
if (Objects.equals(hasDefault, 1) && StrUtil.isBlank(content)) {
|
||||
//contentType 1:三月人力滚动计划;2:三月机械滚动计划;3:人力汇总表;4:机械汇总表;5:工程量报表;6:计划工程量报表;7:月报;8:项目计划;9:三周(月)滚动计划
|
||||
Integer tempType;
|
||||
Integer tempType = contentType;
|
||||
if (Objects.equals(contentType, 7)) {
|
||||
if (Objects.equals(levelType, 1) && Objects.equals(type, 1)) {
|
||||
tempType = 10;
|
||||
@ -690,7 +690,6 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
|
||||
tempType = 13;
|
||||
}
|
||||
} else {
|
||||
tempType = contentType;
|
||||
if (contentType == 5 && levelType == 2) {
|
||||
tempType = 7;
|
||||
} else if (contentType == 6 && levelType == 2) {
|
||||
@ -698,7 +697,7 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
|
||||
} else if (contentType == 8) {
|
||||
//项目计划
|
||||
tempType = 14;
|
||||
} else {
|
||||
} else if (contentType == 9){
|
||||
//三周(月)滚动计划
|
||||
tempType = 15;
|
||||
}
|
||||
@ -816,7 +815,7 @@ public class ContractorMonthlyDetailServiceImpl extends ServiceImpl<ContractorMo
|
||||
//xls设置默认样式
|
||||
JSONObject rootJo1 = JSONObject.parseObject(content);
|
||||
if (rootJo1 != null && contentType != 7) {
|
||||
SheetUtils.setDefaultStyle(rootJo1);
|
||||
// SheetUtils.setDefaultStyle(rootJo1);
|
||||
content = JSON.toJSONString(rootJo1);
|
||||
}
|
||||
return content;
|
||||
|
||||
@ -85,6 +85,7 @@ public class ContractorMonthlyPeriodServiceImpl extends ServiceImpl<ContractorMo
|
||||
.eq(ContractorMonthlyPeriod::getDeviceId, period.getDeviceId())
|
||||
.eq(ContractorMonthlyPeriod::getGroupId, period.getGroupId())
|
||||
.eq(ContractorMonthlyPeriod::getLevelType, period.getLevelType())
|
||||
.eq(ContractorMonthlyPeriod::getMenuType, period.getMenuType())
|
||||
.eq(ContractorMonthlyPeriod::getYear, period.getYear())
|
||||
.eq(ContractorMonthlyPeriod::getMonth, period.getMonth());
|
||||
if (Objects.equals(period.getLevelType(), 2)) {
|
||||
@ -124,6 +125,7 @@ public class ContractorMonthlyPeriodServiceImpl extends ServiceImpl<ContractorMo
|
||||
.eq(ContractorMonthlyPeriod::getMonth, period.getMonth())
|
||||
.eq(ContractorMonthlyPeriod::getWhichWeek, period.getWhichWeek())
|
||||
.eq(ContractorMonthlyPeriod::getLevelType, period.getLevelType())
|
||||
.eq(ContractorMonthlyPeriod::getMenuType, period.getMenuType())
|
||||
.eq(ContractorMonthlyPeriod::getProjectSn, period.getProjectSn())
|
||||
);
|
||||
} else {
|
||||
@ -159,6 +161,7 @@ public class ContractorMonthlyPeriodServiceImpl extends ServiceImpl<ContractorMo
|
||||
.eq(ContractorMonthlyPeriod::getMonth, period.getMonth())
|
||||
.eq(ContractorMonthlyPeriod::getWhichWeek, period.getWhichWeek())
|
||||
.eq(ContractorMonthlyPeriod::getLevelType, period.getLevelType())
|
||||
.eq(ContractorMonthlyPeriod::getMenuType, period.getMenuType())
|
||||
.eq(ContractorMonthlyPeriod::getProjectSn, period.getProjectSn())
|
||||
);
|
||||
return one;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user