zgyw.git - Gitblit

			@@ -90,6 +90,11 @@
			*/
			private Integer status;

			/**
			* 批量导入批次号
			*/
			private String importBatchNumber;

			public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
			if(vo == null) {
			vo = new ReportVO();

			@@ -121,7 +121,7 @@
			form.setPeopleId(people.getId());
			form.setUnitId(people.getBelongUnit());
			form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
			form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTime()));
			form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
			// 读取excel数据
			ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
			List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
			@@ -347,7 +347,7 @@

			// 添加一条审核记录
			ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
			reportAuditingRecord.setReportId(form.getId());
			reportAuditingRecord.setReportId(id);
			reportAuditingRecord.setDeleted(0);
			reportAuditingRecord.setCreateTime(now);
			reportAuditingRecord.setResultRemark(form.getAuditOpinion());

			@@ -96,10 +96,10 @@
			r.id,
			p.point_name
			FROM
			t_report t
			INNER JOIN t_yw_point p ON t.serial_number = p.serial_number
			t_report r
			INNER JOIN t_yw_point p ON r.serial_number = p.serial_number
			WHERE
			t.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
			r.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
			</select>

	ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史