hbwri/skjcmanager.git

			@@ -90,6 +90,12 @@
			</if>
			)
			where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 1 and tdis."check_state" > 1
			<if test="vo.tbYear !=null and vo.tbYear !=''">
			AND tdud."tb_year" = #{vo.tbYear}
			</if>
			<if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
			AND tdud."tb_quarter" = #{vo.tbQuarter}
			</if>
			) as firstLength,
			(
			select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
			@@ -104,6 +110,12 @@
			</if>
			)
			where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 2 and tdis."check_state" > 1
			<if test="vo.tbYear !=null and vo.tbYear !=''">
			AND tdud."tb_year" = #{vo.tbYear}
			</if>
			<if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
			AND tdud."tb_quarter" = #{vo.tbQuarter}
			</if>
			) as secondLength,
			(
			select sum(tdud."danger_length") from sjzt_md."tb_dyke_unit_danger" tdud
			@@ -118,6 +130,12 @@
			</if>
			)
			where trd."guid" = tdud."dyke_id" and tdud."danger_level" = 3 and tdis."check_state" > 1
			<if test="vo.tbYear !=null and vo.tbYear !=''">
			AND tdud."tb_year" = #{vo.tbYear}
			</if>
			<if test="vo.tbQuarter !=null and vo.tbQuarter !=''">
			AND tdud."tb_quarter" = #{vo.tbQuarter}
			</if>
			) as thirdLength

			from sjzt_md."tb_res_dyke" trd

			@@ -32,6 +32,7 @@
			import java.io.IOException;
			import java.text.DecimalFormat;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.stream.Collectors;

			@@ -75,8 +76,8 @@
			state.setDykeGuid(entity.getDykeGuid());
			state.setTbQuarter(entity.getTbQuarter());
			state.setTbYear(entity.getTbYear());
			state.setCreateTime(entity.getCreateTime());
			state.setCreateUser(entity.getCreateUser());
			state.setCreateTime(new Date());
			state.setCreateUser(AuthUtil.getUserAccount());
			} else {
			if (state.getCheckState() > 1) {
			return R.fail(entity.getDykeName() + "本年度已经普查完成，不能再提交了。");
			@@ -129,8 +130,8 @@
			state.setDykeGuid(entity.getDykeGuid());
			state.setTbQuarter(entity.getTbQuarter());
			state.setTbYear(entity.getTbYear());
			state.setCreateTime(entity.getCreateTime());
			state.setCreateUser(entity.getCreateUser());
			state.setCreateTime(new Date());
			state.setCreateUser(AuthUtil.getUserAccount());
			} else {
			//查看填报状态，只有0填报中才可以一直填报
			if (state.getCheckState() > 1) {

	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java	9 ●●●●● patch \| view \| raw \| blame \| history