hbwri/skjcmanager.git

			@@ -2,6 +2,7 @@

			import cn.gistack.sm.sjztmd.entity.TbAttResBuildInfo;
			import cn.gistack.sm.sjztmd.mapper.TbAttResBuildInfoMapper;
			import cn.gistack.sm.sjztmd.service.ITbAttResBaseService;
			import cn.gistack.sm.sjztmd.service.ITbAttResBuildInfoService;
			import cn.gistack.system.user.feign.IUserClient;
			import com.baomidou.dynamic.datasource.annotation.DS;
			@@ -28,6 +29,9 @@
			@Autowired
			private IUserClient userClient;

			@Autowired
			private ITbAttResBaseService tbAttResBaseService;

			/**
			* 查询水库填报详情信息
			* @param guid
			@@ -52,6 +56,7 @@
			// 修改
			int i = addOrUpdateByGuid(detail,tbAttResBuildInfo);
			if (i>0){
			// tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(),0);
			return true;
			}
			return false;
			@@ -64,6 +69,11 @@
			*/
			@Override
			public boolean auditByGuid(TbAttResBuildInfo tbAttResBuildInfo) {
			boolean edit = false;
			// 编辑标记
			if (tbAttResBuildInfo.getCheckState()==4){
			edit = true;
			}
			// 查询是否存在
			TbAttResBuildInfo detail = baseMapper.getDetailByResGuid(tbAttResBuildInfo.getResGuid());
			// 更新操作日志
			@@ -80,6 +90,9 @@
			// 更新数据
			int i = baseMapper.updateById(tbAttResBuildInfo);
			if (i>0){
			if (!edit) {
			tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(),tbAttResBuildInfo.getCheckState());
			}
			return true;
			}
			return false;
			@@ -93,8 +106,10 @@
			private int addOrUpdateByGuid(TbAttResBuildInfo oldAbAttResBase,TbAttResBuildInfo tbAttResBuildInfo){
			int i = 0;
			if (null!=oldAbAttResBase){
			tbAttResBuildInfo.setGuid(oldAbAttResBase.getGuid());
			// 更新
			i = baseMapper.updateById(tbAttResBuildInfo);
			tbAttResBaseService.updateFinalState(tbAttResBuildInfo.getResGuid(), tbAttResBuildInfo.getCheckState());
			}else {
			tbAttResBuildInfo.setCreateTime(new Date());
			i = baseMapper.insert(tbAttResBuildInfo);
			@@ -161,6 +176,11 @@
			if (newTbAttResBuildInfo.getCheckState()==3){
			fillName = "退回" + (null==newTbAttResBuildInfo.getCheckLog()?"":":" + newTbAttResBuildInfo.getCheckLog());
			}
			// 管理员编辑
			if (newTbAttResBuildInfo.getCheckState()==4){
			fillName = "编辑";
			newTbAttResBuildInfo.setCheckState(oldAbAttResBase.getCheckState());
			}

			// 拼接
			String time = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());