~zhangleilei/supipe.git

			@@ -47,5 +47,7 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private String printTime;

			private String platUserName;


			}

			@@ -238,7 +238,7 @@
			}else {
			exportDto.setQualityTime(produceDto.getQualityTime().toString());
			}
			exportDto.setRealName(produceDto.getRealName());
			exportDto.setPlatUserName(produceDto.getPlatUserName());
			exportDto.setQualityUserName(produceDto.getQualityUserName());

			if(produceDto.getIsQualified()!=null && produceDto.getIsQualified()==1){
			@@ -263,7 +263,7 @@
			excel.addHeaderAlias("blockName", "块号");
			excel.addHeaderAlias("groupName", "生产班组");
			excel.addHeaderAlias("printTime", "打印时间");
			excel.addHeaderAlias("realName", "制作人");
			excel.addHeaderAlias("platUserName", "制作人");
			excel.addHeaderAlias("qualityUserName", "质检人");
			excel.addHeaderAlias("qualityTime", "质检时间");
			excel.addHeaderAlias("isQualified", "是否合格");

			@@ -91,6 +91,10 @@
			<if test="isModel!=null and isModel!='' ">
			and tsp.size_id=#{sizeId}
			</if>
			<if test="realName!=null and realName!='' ">
			and spu.real_name regexp #{realName}
			</if>

			order by tsp.produce_number desc
			</select>
			<select id="steelProduceInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">

	hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceExportDto.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史