Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-10-31 ea5a71d924e0163f2fb7cae00fc390b5068c050b

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java

@@ -160,7 +160,7 @@
    /**
     * 最终填报状态（总状态）（-1：未填写 0:填写中，1:审核通过）
     */
    @ApiModelProperty(value = "填报状态（-1：未填写 0:填写中，1:审核通过） ")
    @ApiModelProperty(value = "填报状态（-1：未填写 0:填写中，1:审核通过 2:审核中） ")
    @TableField("\"final_state\"")
    @JsonSerialize(using = ToStringSerializer.class)
    private Integer finalState;
@@ -197,4 +197,11 @@
    @TableField("\"log\"")
    private String log;

    /**
     * 所属行业部门
     */
    @ApiModelProperty(value = "所属行业部门 ")
    @TableField("\"industry_dept\"")
    private String industryDept;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java

@@ -85,11 +85,18 @@
    private Double exportElevation;

    /**
     * 断面尺寸
     * 断面尺寸/面积
     */
    @ApiModelProperty(value = "断面尺寸")
    @TableField("\"section_size\"")
    private Double sectionSize;
    @ApiModelProperty(value = "断面尺寸/面积")
    @TableField("\"section_wide\"")
    private Double sectionWide;

    /**
     * 断面尺寸/高
     */
    @ApiModelProperty(value = "断面尺寸/高")
    @TableField("\"section_high\"")
    private Double sectionHigh;

    /**
     * 设计流量

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.java

@@ -57,4 +57,13 @@
    @DS("zt")
    @InterceptorIgnore(tenantLine = "true")
    Boolean getFinalCheckStateByGuid(@Param("guid")String guid);

    /**
     * 否则判断是否审核中
     * @param resGuid
     * @return
     */
    @DS("zt")
    @InterceptorIgnore(tenantLine = "true")
    Boolean getFinalCheckStateCheckLoadingByGuid(@Param("guid") String resGuid);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbAttResBaseMapper.xml

@@ -88,4 +88,24 @@
            (SELECT ifnull(sum("check_state"),-1) as value FROM "tb_file_storage_location" WHERE "res_guid" = #{guid} limit 1)
        ) a
    </select>

    <!--查询水库基本详情，水位特征，挡水，输水，泄洪建筑物，电站，水库效益，工程运用，管理体制，安全鉴定和除险加固，信息化建设，文件夹存储位置所有状态的一个总状态(是否为审核中)-->
    <select id="getFinalCheckStateCheckLoadingByGuid" resultType="java.lang.Boolean">
        select if(sum(value)&lt;14,false,true) from (
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_base" WHERE "guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_eng_bene" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_infomation_project" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_mgr_sys_b" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_power_station" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_project_utilize" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_rsb_norspi" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_rsb_spillway" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_rsb_verspi" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_safety_monitor" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_stag_char" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_water_block" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_att_res_water_delivery" WHERE "res_guid" = #{guid} limit 1 )union all
            (SELECT if(ifnull(sum("check_state"),-1)>0,1,0) as value FROM "tb_file_storage_location" WHERE "res_guid" = #{guid} limit 1)
        ) a
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java

@@ -333,7 +333,15 @@
            if (flag){
                tbAttResBase.setFinalState(1);
            }else {
                tbAttResBase.setFinalState(0);
                // 否则判断是否审核中
                flag = baseMapper.getFinalCheckStateCheckLoadingByGuid(resGuid);
                if (flag){
                    // 设置为审核中
                    tbAttResBase.setFinalState(2);
                }else {
                    // 填写中
                    tbAttResBase.setFinalState(0);
                }
            }
        }else {
            tbAttResBase.setFinalState(0);

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/XsfsQktjController.java

@@ -30,7 +30,7 @@
@Slf4j
@Api(tags = "蓄水放水情况统计表")
@RestController
@RequestMapping("/sjztods/xsfsQktj")
@RequestMapping("/xsfsQktj/xsfsQktj")
@AllArgsConstructor
public class XsfsQktjController {


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/mapper/SkxsQkTjMapper.xml

@@ -32,7 +32,7 @@
            <if test="skxsQkTj.resName!=null and skxsQkTj.resName!=''">
                and sqt."res_name" like concat('%',#{skxsQkTj.resName},'%')
            </if>
        ) x
        ) x where 1=1
        <if test="skxsQkTj.adCode!=null and skxsQkTj.adCode!='' and skxsQkTj.adCode!='420000000000'">
            and (townCode = #{skxsQkTj.adCode} or countyCode = #{skxsQkTj.adCode} or cityCode = #{skxsQkTj.adCode})
        </if>
@@ -81,7 +81,7 @@
            <if test="skxsQkTj.resName!=null and skxsQkTj.resName!=''">
                and sqt."res_name" like concat('%',#{skxsQkTj.resName},'%')
            </if>
        ) a
        ) a where 1=1
        <if test="skxsQkTj.adCode!=null and skxsQkTj.adCode!='' and skxsQkTj.adCode!='420000000000'">
            and (townCode = #{skxsQkTj.adCode} or countyCode = #{skxsQkTj.adCode} or cityCode = #{skxsQkTj.adCode})
        </if>
@@ -130,7 +130,7 @@
            <if test="skxsQkTj.resName!=null and skxsQkTj.resName!=''">
                and sqt."res_name" like concat('%',#{skxsQkTj.resName},'%')
            </if>
        ) x
        ) x where 1=1
        <if test="skxsQkTj.adCode!=null and skxsQkTj.adCode!='' and skxsQkTj.adCode!='420000000000'">
            and (townCode = #{skxsQkTj.adCode} or countyCode = #{skxsQkTj.adCode} or cityCode = #{skxsQkTj.adCode})
        </if>