Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-11-21 d4bc64680418827ff4bfa879eb7c8490e20a20db

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java

@@ -103,6 +103,20 @@
        return materialReleaseService.siloList(types);
    }

    // 拌合站 （2023-11-16） 标识牌， 手动添加 原料消耗  t_mixing_consume -> t_mixing_signboard
    @PostMapping("/mixingConsumeIn")
    public BasicResult mixingConsumeIn(@RequestBody Map<String,Object> values){
        return materialReleaseService.mixingConsumeIn(values);
    }

    //  ！！！列表 ：拌合站 （2023-11-16） 标识牌， 手动添加 原料消耗  t_mixing_consume -> t_mixing_signboard
    @PostMapping("/mixingConsumeList")
    public BasicResult mixingConsumeList(@RequestBody Map<String,Object> values){
        return materialReleaseService.mixingConsumeList(values);
    }





}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java

@@ -70,6 +70,10 @@
     * 报告编号
     */
    private String percentage;
    /**
     * 检验时间
     */
    private String inspectDate;

    /**
     * This field was generated by MyBatis Generator.

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingConsume.java

对比新文件
@@ -0,0 +1,75 @@
package com.thhy.materials.modules.biz.concret.entity;

import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

import java.io.Serializable;

@Data
@Getter
@Setter
@ToString
public class TMixingConsume implements Serializable {
    /**
     * 原料消耗id（与t_mixing_signboard）关联
     */
    private String mixingConsumeId;

    /**
     * 原料名称
     */
    private String dictId;

    /**
     * 规格型号
     */
    private String spec;

    /**
     * 生产厂家
     */
    private String manufacturer;

    /**
     * 含水率
     */
    private String watFull;

    /**
     * 理论用量(kg/m3)
     */
    private String planAmnt;

    /**
     * 实际用量(kg/m3)
     */
    private String factAmnt;

    /**
     * 施工日期
     */
    private String saveStamp;

    /**
     * 施工部位
     */
    private String construction;
    /**
     * 施工部位
     */
    private String mixingSignboardId;
    //原料名称
    private String dictName;

    private Integer star;

    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database table t_mixing_consume
     *
     * @mbg.generated Thu Nov 16 13:59:09 CST 2023
     */
    private static final long serialVersionUID = 1L;
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixingSignboard.java

对比新文件
@@ -0,0 +1,49 @@
package com.thhy.materials.modules.biz.concret.entity;

import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;

import java.io.Serializable;
import java.util.List;

@Data
@Getter
@Setter
@ToString
public class TMixingSignboard implements Serializable {
    /**
     * 搅拌站id
     */
    private String mixingSignboardId;

    /**
     * 拌合标识牌名称
     */
    private String signboardName;

    /**
     * 工程项目id
     */
    private String proId;

    /**
     * 原料名称
     */
    private String mixingConsume;
    //项目名称
    private String proName;
    //施工单位
    private String constructionUnit;

    private List<TMixingConsume> tMixingConsumes;

    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database table t_mixing_signboard
     *
     * @mbg.generated Thu Nov 16 13:59:22 CST 2023
     */
    private static final long serialVersionUID = 1L;
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java

@@ -3,6 +3,7 @@
import com.thhy.general.annotations.Idkey;
import com.thhy.materials.modules.biz.concret.entity.*;
import com.thhy.materials.modules.biz.concret.entity.dto.PieceDto;
import org.apache.ibatis.annotations.Param;

import java.util.HashMap;
import java.util.List;
@@ -34,4 +35,16 @@
    List<TSilo> siloList(Integer types);

    TMixing mixingLists(String siloId);

    void mixingConsumeIn(@Idkey("mixingSignboardId") Map<String, Object> values);

    void mixingConsumeInTwo(@Idkey("mixingConsumeId") TMixingConsume mixingConsume);

    Integer starInt();

    List<TMixingSignboard> mixingSignboardList(Map<String, Object> values);

    Integer starIntSig(String mixingSignboardId);

    List<TMixingConsume> mixingConsumes(@Param("mixingSignboardId") String mixingSignboardId,@Param("star") Integer star);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java

@@ -27,4 +27,8 @@
    BasicResult mixingList(HashMap<String, Object> values);

    BasicResult siloList(Integer types);

    BasicResult mixingConsumeIn(Map<String, Object> values);

    BasicResult mixingConsumeList(Map<String, Object> values);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java

@@ -246,4 +246,35 @@
        }
        return BasicResult.success(tSilos);
    }

    @Override
    @Transactional
    public BasicResult mixingConsumeIn(Map<String, Object> values) {
        values.put("mixingSignboardId","");
        materialReleaseMappper.mixingConsumeIn(values);
        String mixingSignboardId = values.get("mixingSignboardId").toString();
        Integer star = materialReleaseMappper.starInt();
        List<TMixingConsume> mixingConsumes = (List<TMixingConsume>) values.get("mixingConsume");
        for (TMixingConsume mixingConsume :mixingConsumes){
            mixingConsume.setMixingSignboardId(mixingSignboardId);
            mixingConsume.setStar(star+1);
            materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
        }
        return BasicResult.success();
    }

    @Override
    public BasicResult mixingConsumeList(Map<String, Object> values) {
        Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
        Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
        PageHelper.startPage(pageNum,pageSize);
        List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingSignboardList(values);
        for (TMixingSignboard mixingSignboard : mixingSignboards){
            Integer star = materialReleaseMappper.starIntSig(mixingSignboard.getMixingSignboardId());
            List<TMixingConsume> mixingConsumes = materialReleaseMappper.mixingConsumes(mixingSignboard.getMixingSignboardId(),star);
            mixingSignboard.setTMixingConsumes(mixingConsumes);
        }
        PageInfo<TMixingSignboard> tMixingSignboardPageInfo = new PageInfo<>(mixingSignboards);
        return BasicResult.success(tMixingSignboardPageInfo);
    }
}

 hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml

@@ -202,6 +202,9 @@
      <if test="percentage != null">
        percentage,
      </if>
      <if test="inspectDate != null">
        inspect_date,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="mixingId != null">
@@ -240,6 +243,9 @@
      <if test="percentage != null">
        #{percentage,jdbcType=VARCHAR},
      </if>
      <if test="inspectDate != null">
        #{inspectDate,jdbcType=VARCHAR},
      </if>
    </trim>
  </insert>
  <select id="mixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
@@ -255,7 +261,8 @@
        report_number as reportNumber,
        stata as stata,
        silo_id as siloId,
        percentage as percentage
        percentage as percentage,
        inspect_date as inspectDate
        from t_mixing where silo_id=#{siloId}
        order by in_date desc limit 0,1
  </select>
@@ -283,4 +290,147 @@
     types as types
     from t_silo where types=#{types}
  </select>
  <insert id="mixingConsumeIn" keyProperty="mixingSignboardId" useGeneratedKeys="true" parameterType="java.util.Map">
    insert into t_mixing_signboard
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="mixingSignboardId != null">
        mixing_signboard_id,
      </if>
      <if test="signboardName != null">
        signboard_name,
      </if>
      <if test="proId != null">
        pro_id,
      </if>
      <if test="mixingConsume != null">
        mixing_consume,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="mixingSignboardId != null">
        #{mixingSignboardId,jdbcType=VARCHAR},
      </if>
      <if test="signboardName != null">
        #{signboardName,jdbcType=VARCHAR},
      </if>
      <if test="proId != null">
        #{proId,jdbcType=VARCHAR},
      </if>
      <if test="mixingConsume != null">
        #{mixingConsume,jdbcType=VARCHAR},
      </if>
    </trim>
  </insert>
  <insert id="mixingConsumeInTwo" parameterType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume">
    insert into t_mixing_consume
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="mixingConsumeId != null">
        mixing_consume_id,
      </if>
      <if test="dictId != null">
        dict_id,
      </if>
      <if test="spec != null">
        spec,
      </if>
      <if test="manufacturer != null">
        manufacturer,
      </if>
      <if test="watFull != null">
        wat_full,
      </if>
      <if test="planAmnt != null">
        plan_amnt,
      </if>
      <if test="factAmnt != null">
        fact_amnt,
      </if>
      <if test="saveStamp != null">
        save_stamp,
      </if>
      <if test="construction != null">
        construction,
      </if>
      <if test="mixingSignboardId != null">
        mixing_signboard_id,
      </if>
      <if test="star != null">
        star,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="mixingConsumeId != null">
        #{mixingConsumeId,jdbcType=VARCHAR},
      </if>
      <if test="dictId != null">
        #{dictId,jdbcType=VARCHAR},
      </if>
      <if test="spec != null">
        #{spec,jdbcType=VARCHAR},
      </if>
      <if test="manufacturer != null">
        #{manufacturer,jdbcType=VARCHAR},
      </if>
      <if test="watFull != null">
        #{watFull,jdbcType=VARCHAR},
      </if>
      <if test="planAmnt != null">
        #{planAmnt,jdbcType=VARCHAR},
      </if>
      <if test="factAmnt != null">
        #{factAmnt,jdbcType=VARCHAR},
      </if>
      <if test="saveStamp != null">
        #{saveStamp,jdbcType=VARCHAR},
      </if>
      <if test="construction != null">
        #{construction,jdbcType=VARCHAR},
      </if>
      <if test="mixingSignboardId != null">
        #{mixingSignboardId,jdbcType=VARCHAR},
      </if>
      <if test="star != null">
        #{star},
      </if>
    </trim>
  </insert>
  <select id="starInt" resultType="java.lang.Integer">
    select star from t_mixing_consume order by star desc limit 0,1
  </select>
  <select id="starIntSig" parameterType="java.lang.String" resultType="java.lang.Integer">
    select star from t_mixing_consume where  mixing_signboard_id=#{mixingSignboardId} order by star desc limit 0,1
  </select>
  <select id="mixingSignboardList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard">
    select tms.mixing_signboard_id as mixingSignboardId,
    tms.signboard_name as signboardName,
    tms.pro_id as proId,
    tms.mixing_consume as mixingConsume,
    sp.pro_name as proName,
    sp.construction_unit as constructionUnit
     from  t_mixing_signboard tms
     left join sys_project sp on tms.pro_id=sp.pro_id
    where  1=1
    <if test="signboardName!=null and signboardName!='' ">
        and  tms.signboard_name like concat('%',#{signboardName},'%')
    </if>
  </select>

  <select id="mixingConsumes" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume">
    select
    mc.mixing_consume_id as mixingConsumeId,
    sd.dict_name as dictName,
    mc.spec as spec,
    mc.manufacturer as manufacturer,
    mc.wat_full as watFull,
    mc.plan_amnt as planAmnt,
    mc.fact_amnt as factAmnt,
    mc.save_stamp as saveStamp,
    mc.construction as construction,
    mc.mixing_signboard_id as mixingSignboardId,
    mc.star as star
     from t_mixing_consume mc
     left join  sys_dict sd on mc.dict_id=sd.dict_id
     where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star}
  </select>

</mapper>