hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/dto/PieceDto.java
@@ -11,6 +11,9 @@ private Integer byId; private String bldTim; private Integer types; private List<TRawMaterial> rawMaterials;
@@ -26,7 +26,7 @@ List<PieceDto> pieceList(HashMap<String, Object> values); List<TRawMaterial> materialRew(Integer byId); List<TRawMaterial> materialRew(@Param("byId") Integer byId,@Param("types")Integer types); void mixingInsert(@Idkey("mixingId") Map<String,Object> mixing);
@@ -214,7 +214,7 @@ PageHelper.startPage(pageNum,pageSize); List<PieceDto> pieceDtos = materialReleaseMappper.pieceList(values); for (PieceDto pieceDto : pieceDtos){ List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById()); List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById(),pieceDto.getTypes()); pieceDto.setRawMaterials(rawMaterials); } PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos); hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -147,10 +147,16 @@ where material_release_id=#{materialReleaseId} </update> <select id="pieceList" resultType="com.thhy.materials.modules.biz.concret.entity.dto.PieceDto"> select by_id as byId from t_piece select by_id as byId, BldTim as bldTim, types as types from t_piece where 1=1 <if test="byId!=null and byId!='' "> and by_id=#{byId} </if> <if test="types!=null and types!=''"> and types=#{types} </if> ORDER BY by_id desc </select> @@ -161,7 +167,7 @@ PlanAmnt as planamnt, FactAmnt as factamnt from t_raw_material where Piece=#{byId} where Piece=#{byId} and types=#{types} </select> <insert id="mixingInsert" > insert into t_mixing @@ -433,7 +439,7 @@ <select id="mixingConsumes" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume"> select mc.mixing_consume_id as mixingConsumeId, sd.dict_name as dictName, -- sd.dict_name as dictName, mc.dict_id as dictId, mc.spec as spec, mc.manufacturer as manufacturer, @@ -447,7 +453,7 @@ mc.create_time as createTime, mc.construction_unit as constructionUnit from t_mixing_consume mc left join sys_dict sd on mc.dict_id=sd.dict_id -- left join sys_dict sd on mc.dict_id=sd.dict_id where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star} <!-- <if test="strTime!=null and strTime!='' and endTime !=null and endTime!=''">--> <!-- and mc.create_time between #{strTime} and #{endTime}-->
