zhanghl
2025-04-25 15fbf58a52b504f919d72189bdd87fc5c42de374
气体管理 增加 planType
已修改4个文件
31 ■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/bootstrap-int.yml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -161,6 +161,16 @@
    @Excel(name = "风险标识")
    private Integer hasRisk;
    public String getPlanType() {
        return planType;
    }
    public void setPlanType(String planType) {
        this.planType = planType;
    }
    private String planType;
    public void setId(String id)
    {
        this.id = id;
aps-modules/aps-core/src/main/resources/bootstrap-int.yml
@@ -7,7 +7,9 @@
        server-addr: 192.168.50.160:8848
        namespace: aafcd57a-d0f7-43e3-a77d-1dc85aec1f0e
        metadata:
          local: int
          local: zhl
        ip: 192.168.50.13
      config:
        # 配置中心地址
        server-addr: 192.168.50.160:8848
aps-modules/aps-core/src/main/resources/bootstrap.yml
@@ -9,4 +9,4 @@
    name: aps-core
  profiles:
    # 环境配置
    active: dev
    active: int
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingPlanMapper.xml
@@ -40,10 +40,18 @@
        <result property="isStockComplete"    column="is_stock_complete"    />
        <result property="hasTurnback"    column="has_turnback"    />
        <result property="hasRisk"    column="has_risk"    />
        <result property="planType"    column="plan_type"    />
    </resultMap>
    <sql id="selectApsGasPipingPlanVo">
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer, business_type, document_number, requirement_type, document_status, item_number, drawing_no, version_number, production_quantity, good_products_quantity, process_number, work_center, department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials, advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete, has_turnback, has_risk from aps_gas_piping_plan
        select id, master_planner, week_day, week_cycle, main_part_number, main_part_drawing_number, customer,
               business_type, document_number, requirement_type, document_status, item_number, drawing_no,
               version_number, production_quantity, good_products_quantity, process_number, work_center,
               department, plan_start_day, plan_end_day, standby_number, standby_name, standby_stock,
               next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
               advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
               has_turnback, has_risk ,plan_type
        from aps_gas_piping_plan
    </sql>
    <select id="selectApsGasPipingPlanList" parameterType="ApsGasPipingPlan" resultMap="ApsGasPipingPlanResult">
@@ -79,7 +87,7 @@
            <if test="isStockComplete != null "> and is_stock_complete = #{isStockComplete}</if>
            <if test="hasTurnback != null "> and has_turnback = #{hasTurnback}</if>
            <if test="hasRisk != null "> and has_risk = #{hasRisk}</if>
            <if test="planType != null "> and plan_type = #{planType}</if>
           and del_flag ='0'
        </where>
    </select>
@@ -127,6 +135,7 @@
            <if test="isStockComplete != null">is_stock_complete,</if>
            <if test="hasTurnback != null">has_turnback,</if>
            <if test="hasRisk != null">has_risk,</if>
            <if test="planType != null">plan_type,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id != ''">#{id},</if>
@@ -164,6 +173,7 @@
            <if test="isStockComplete != null">#{isStockComplete},</if>
            <if test="hasTurnback != null">#{hasTurnback},</if>
            <if test="hasRisk != null">#{hasRisk},</if>
            <if test="planType != null">#{planType},</if>
         </trim>
    </insert>
@@ -204,6 +214,7 @@
            <if test="isStockComplete != null">is_stock_complete = #{isStockComplete},</if>
            <if test="hasTurnback != null">has_turnback = #{hasTurnback},</if>
            <if test="hasRisk != null">has_risk = #{hasRisk},</if>
            <if test="planType != null">plan_type = #{planType},</if>
        </trim>
        where id = #{id}
    </update>