企业不统计到班组，项目加个桥梁重量(t)，去掉项目编号，问题分类只选二级

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
      */

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<List<EntityMap>> getEnterpriseInfoList(@RequestBody Map<String, Object> map) {

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")

src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/EnterpriseInfoMapper.xml

@@ -43,6 +43,9 @@
         <if test="map.isCountMainEnterprise == '1'.toString()">
             and b.parent_project_enterprise_id = 0
         </if>
+        <if test="map.notCountToTeam != null">
+            and a.not_count_to_team = #{map.notCountToTeam}
+        </if>
         order by b.sort_num
     </sql>
     <select id="getEnterpriseInfoList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">

src/main/java/com/zhgd/xmgl/task/Mcs8Task.java

@@ -64,7 +64,7 @@ public class Mcs8Task {
     /**
      * 定时更新执法仪设备状态
      */
-    @Scheduled(cron = "*/5 * * * * ?")
+    @Scheduled(cron = "* */10 * * * ?")
     @RequestMapping("updateStatus")
     public void updateStatus() {
         List<Project> projects = projectService.list();

src/main/resources/application-gsx-other-env-show.properties

@@ -1,6 +1,6 @@
 #http.port=30250
 http.port=23912
-spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
+spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_guangshengaosu_dev?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
 spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
 spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)

src/main/resources/jeecg/jeecg_database.properties

@@ -1,11 +1,11 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://127.0.0.1:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+url=jdbc:mysql://127.0.0.1:3306/wisdomsite_guangshengaosu_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #url=jdbc:mysql://127.0.0.1:3306/itbgp_bank?useUnicode=true&characterEncoding=UTF-8
 #url=jdbc:mysql://139.9.66.234:3306/dev_manage?useUnicode=true&characterEncoding=UTF-8
 username=root
 password=root
-database_name=wisdomsite_other_env_show
+database_name=wisdomsite_guangshengaosu_dev
 #database_name=dev_manage
 
 #oracle