From 2dad23aa9eec70276bb855be739174a149094a5c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 25 Nov 2025 15:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=B8=8D=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=B0=E7=8F=AD=E7=BB=84=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=8A=A0?= =?UTF-8?q?=E4=B8=AA=E6=A1=A5=E6=A2=81=E9=87=8D=E9=87=8F(t)=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=88=86=E7=B1=BB=E5=8F=AA=E9=80=89=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/modules/project/entity/Project.java | 5 +++++ .../modules/worker/controller/EnterpriseInfoController.java | 1 + .../com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java | 6 +++++- .../xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml | 3 +++ src/main/java/com/zhgd/xmgl/task/Mcs8Task.java | 2 +- .../resources/application-gsx-other-env-show.properties | 2 +- src/main/resources/jeecg/jeecg_database.properties | 4 ++-- 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java index 571ba4c11..714e6e3c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/Project.java @@ -363,6 +363,11 @@ public class Project implements Serializable { @Excel(name = "桥梁长度(m)", width = 15) @ApiModelProperty(value = "桥梁长度(m)") private java.lang.String bridgeLength; + /** + *桥梁重量(t) + */ + @ApiModelProperty("桥梁重量(t)") + private String bridgeWeight; /** * runde平台token */ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java index b9cb383c7..0b992d256 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java @@ -80,6 +80,7 @@ public class EnterpriseInfoController { @ApiImplicitParam(name = "projectSn", value = "项目sN", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "isCountMainEnterprise", value = "0默认1是总包", paramType = "query", required = false, dataType = "Integer"), @ApiImplicitParam(name = "securityRegionIdList", value = "区域IdList（查安全管理绑定的公司）", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "notCountToTeam", value = "不统计到班组(1是0否)", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/list") public Result> getEnterpriseInfoList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java index 0cab5ea34..99cc59257 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java @@ -162,7 +162,11 @@ public class EnterpriseInfo implements Serializable { @Excel(name = "营业执照图片地址", width = 15) @ApiModelProperty(value="营业执照图片地址") private java.lang.String businessLicenseUrl ; - + /** + *不统计到班组(1是0否) + */ + @ApiModelProperty("不统计到班组(1是0否)") + private Integer notCountToTeam; /**enterprise_type表外键*/ @TableField(exist = false) @ApiModelProperty(value="企业类型Id") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml index 016af920c..30b67f2a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml @@ -43,6 +43,9 @@ and b.parent_project_enterprise_id = 0 + + and a.not_count_to_team = #{map.notCountToTeam} + order by b.sort_num