hbwri/skjcmanager.git

			@@ -54,5 +54,15 @@
			@ApiModelProperty("每页的数量")
			private Integer size;

			/**
			* 上报时间
			*/
			private String reportTime;


			/**
			* 项目排序 0状态， 1进度，2注册码
			*/
			private Integer projectSort;

			}

			@@ -25,6 +25,12 @@
			<if test="dto.reportPerson != null ">
			and report.report_user = #{dto.reportPerson}
			</if>
			<if test="dto.startTime != null and dto.startTime !='' ">
			and report.report_time >= #{dto.startTime}
			</if>
			<if test="dto.endTime != null and dto.endTime !='' ">
			and report.report_time <= #{dto.endTime}
			</if>
			</select>

			<select id="queryPageListAll" resultType="cn.gistack.sm.sg.VO.SgProgressReportVO">
			@@ -101,6 +107,12 @@
			</if>
			AND userR.approval_order != 0
			</if>
			<if test="dto.startTime != null and dto.startTime !='' ">
			and report.report_time >= #{dto.startTime}
			</if>
			<if test="dto.endTime != null and dto.endTime !='' ">
			and report.report_time <= #{dto.endTime}
			</if>
			<choose >
			<when test="dto.approvalStatus != null and dto.approvalStatus == 0">
			and report.audit_person = #{dto.userId} and (report."STATUS" = 0 or report."STATUS" = 1)

			@@ -42,7 +42,12 @@
			#{id}
			</foreach>
			</if>
			ORDER BY info.status desc
			<if test="dto.projectSort == null or dto.projectSort ==0">
			ORDER BY info.status desc
			</if>
			<if test="dto.projectSort != null and dto.projectSort ==2">
			ORDER BY info.sk_id asc
			</if>
			</select>
			<select id="queryStepByProject" resultType="cn.gistack.sm.sg.VO.SgProjectInfoVO">

	skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java	10 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml	12 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml	7 ●●●●● patch \| view \| raw \| blame \| history