Commit 6bd6083d by jiangyun

修改

parent fdf8ed13
...@@ -2299,6 +2299,19 @@ public class SjDjjcController extends BaseController { ...@@ -2299,6 +2299,19 @@ public class SjDjjcController extends BaseController {
return sjDjjcService.jsljjz(sjDjjc); return sjDjjcService.jsljjz(sjDjjc);
} }
/**
* 复制方案
*
* @param sjDjjc
* @return
*/
@GetMapping("/copySjDjjc")
public AjaxResult copySjDjjc(SjDjjc sjDjjc) throws Exception {
return sjDjjcService.copySjDjjc(sjDjjc);
}
/** /**
* 解析文件 * 解析文件
* *
......
...@@ -266,7 +266,8 @@ public class SjDjjc extends ProcessBaseEntity ...@@ -266,7 +266,8 @@ public class SjDjjc extends ProcessBaseEntity
//方案类型 //方案类型
private String falx; private String falx;
//查看范围
private String ckfw;
} }
package com.zjsgfa.project.zjsgfa.mapper; package com.zjsgfa.project.zjsgfa.mapper;
import java.util.List; import java.util.List;
import java.util.Map;
import com.zjsgfa.project.zjsgfa.domain.SjDjjc; import com.zjsgfa.project.zjsgfa.domain.SjDjjc;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
/** /**
* 设计信息-井基础信息Mapper接口 * 设计信息-井基础信息Mapper接口
...@@ -80,4 +83,67 @@ public interface SjDjjcMapper ...@@ -80,4 +83,67 @@ public interface SjDjjcMapper
int deleteLc(String instanceId); int deleteLc(String instanceId);
void updateBatchById(@Param("newJh") String newJh,@Param("jh") String jh);
// ============== jh关联从表 ==============
void copySjDcfxDzfc(Map<String, Object> params);
void copySjDcfxTsyx(Map<String, Object> params);
void copySjDzfc(Map<String, Object> params);
void copySjFdfx(Map<String, Object> params);
void copySjFdsgcs(Map<String, Object> params);
void copySjFdsgcsDcylZjymdsjb(Map<String, Object> params);
void copySjFdsgcsDcylZjymdtjb(Map<String, Object> params);
void copySjFdsgcsDcyx(Map<String, Object> params);
void copySjFdsgcsTsgj(Map<String, Object> params);
void copySjFdsgcsZjfxzt(Map<String, Object> params);
void copySjFdsgcsZjyFdxnb(Map<String, Object> params);
void copySjFl(Map<String, Object> params);
void copySjGztz(Map<String, Object> params);
void copySjH2s(Map<String, Object> params);
void copySjHse(Map<String, Object> params);
void copySjJhzq(Map<String, Object> params);
void copySjJkzp(Map<String, Object> params);
void copySjJsjg(Map<String, Object> params);
void copySjJygjGdfdcs(Map<String, Object> params);
void copySjJygjGdsjgdcs(Map<String, Object> params);
void copySjJygjInfo(Map<String, Object> params);
void copySjJygjgdsj(Map<String, Object> params);
void copySjLjjw(Map<String, Object> params);
void copySjLjsm(Map<String, Object> params);
void copySjLjtjzt(Map<String, Object> params);
void copySjLjzjysyqk(Map<String, Object> params);
void copySjQkztfx(Map<String, Object> params);
void copySjSggyGjsbxnyq(Map<String, Object> params);
void copySjSggyZjyCljl(Map<String, Object> params);
void copySjSggyZjyFdsj(Map<String, Object> params);
void copySjSggyZjyFdxnb(Map<String, Object> params);
void copySjSggyZjzhcs(Map<String, Object> params);
void copySjSzfxjg(Map<String, Object> params);
void copySjTgTgqdjh(Map<String, Object> params);
void copySjTgTgxnsj(Map<String, Object> params);
void copySjTgTgz(Map<String, Object> params);
void copySjZjcsxx(Map<String, Object> params);
void copySjZjyCljl(Map<String, Object> params);
void copySjZjyFdsj(Map<String, Object> params);
void copySjZjyFdxnb(Map<String, Object> params);
void copySjZlyq(Map<String, Object> params);
void copySjZlyqXx(Map<String, Object> params);
void copySjZlyqZbyq(Map<String, Object> params);
void copySjZqfx(Map<String, Object> params);
void copySjZsjqk(Map<String, Object> params);
void copySjZtcsxx(Map<String, Object> params);
void copySjZtgjsj(Map<String, Object> params);
void copySjZtxx(Map<String, Object> params);
void copySjZysx(Map<String, Object> params);
// ============== zbid关联从表 ==============
void copySjFdsgcsDcyxt(Map<String, Object> params);
void copySjFzqkms(Map<String, Object> params);
void copySjGcjbsj(Map<String, Object> params);
void copySjJsjgt(Map<String, Object> params);
void copySjLjfzqk(Map<String, Object> params);
void copySjLjzjyfzqk(Map<String, Object> params);
void copySjNdxm(Map<String, Object> params);
void copySjBcxx(Map<String, Object> params);
} }
...@@ -76,4 +76,6 @@ public interface ISjDjjcService ...@@ -76,4 +76,6 @@ public interface ISjDjjcService
List<SjDjjc> getGcList(SjDjjc sjDjjc); List<SjDjjc> getGcList(SjDjjc sjDjjc);
AjaxResult copySjDjjc(SjDjjc sjDjjc);
} }
...@@ -7,6 +7,7 @@ import java.util.regex.Matcher; ...@@ -7,6 +7,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
...@@ -160,6 +161,9 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -160,6 +161,9 @@ public class SjDjjcServiceImpl implements ISjDjjcService
@DataScope(deptAlias = "d", userAlias = "u") @DataScope(deptAlias = "d", userAlias = "u")
public List<SjDjjc> selectSjDjjcList(SjDjjc sjDjjc) public List<SjDjjc> selectSjDjjcList(SjDjjc sjDjjc)
{ {
if("1".equals(sjDjjc.getCkfw())){
sjDjjc.setCreatedBy(SecurityUtils.getUsername());
}
return sjDjjcMapper.selectSjDjjcList(sjDjjc); return sjDjjcMapper.selectSjDjjcList(sjDjjc);
} }
...@@ -478,6 +482,8 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -478,6 +482,8 @@ public class SjDjjcServiceImpl implements ISjDjjcService
@Transactional @Transactional
public int updateSjDjjc(SjDjjc sjDjjc) throws Exception public int updateSjDjjc(SjDjjc sjDjjc) throws Exception
{ {
//查出原来的井号
SjDjjc oldSjDjjc = sjDjjcMapper.selectSjDjjcById(sjDjjc.getId());
sjDjjc.setUpdateTime(DateUtils.getNowDate()); sjDjjc.setUpdateTime(DateUtils.getNowDate());
sjDjjc.setUpdateBy(SecurityUtils.getUsername()); sjDjjc.setUpdateBy(SecurityUtils.getUsername());
...@@ -674,10 +680,14 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -674,10 +680,14 @@ public class SjDjjcServiceImpl implements ISjDjjcService
} }
} }
} }
if(!sjDjjc.getJh().equals(oldSjDjjc.getJh())){
//更新所有表
sjDjjcMapper.updateBatchById(sjDjjc.getJh(),oldSjDjjc.getJh());
}
return sjDjjcMapper.updateSjDjjc(sjDjjc); return sjDjjcMapper.updateSjDjjcById(sjDjjc);
} }
/** /**
...@@ -1483,5 +1493,111 @@ public class SjDjjcServiceImpl implements ISjDjjcService ...@@ -1483,5 +1493,111 @@ public class SjDjjcServiceImpl implements ISjDjjcService
return sjDjjcMapper.getGcList(sjDjjc); return sjDjjcMapper.getGcList(sjDjjc);
} }
@Override
@Transactional
public AjaxResult copySjDjjc(SjDjjc sjDjjc) {
//
SjDjjc oldSjDjjc = sjDjjcMapper.selectSjDjjcById(sjDjjc.getId());
SjDjjc newSjDjjc =new SjDjjc();
BeanUtil.copyProperties(oldSjDjjc, newSjDjjc);
newSjDjjc.setJh(sjDjjc.getJh());
newSjDjjc.setCreatedTime(new Date());
newSjDjjc.setCreatedBy(SecurityUtils.getUsername());
newSjDjjc.setUpdateBy(null);
newSjDjjc.setUpdateTime(null);
newSjDjjc.setZjyprocessStatus("未提交");
newSjDjjc.setZjytype(null);
newSjDjjc.setZjyapplyTime(null);
newSjDjjc.setZjyinstanceId(null);
newSjDjjc.setZjyapplyUser(null);
newSjDjjc.setZjyrefuseContent(null);
newSjDjjc.setProcessStatus("未提交");
newSjDjjc.setType(null);
newSjDjjc.setApplyTime(null);
newSjDjjc.setInstanceId(null);
newSjDjjc.setApplyUser(null);
newSjDjjc.setRefuseContent(null);
int i = sjDjjcMapper.insertSjDjjc(newSjDjjc);
Long oldId =oldSjDjjc.getId();
String oldJh =oldSjDjjc.getJh();
Long newId =newSjDjjc.getId();
String newJh =newSjDjjc.getJh();
Map<String, Object> params = new HashMap<>();
params.put("oldJh", oldJh);
params.put("oldId", oldId);
params.put("newJh", newJh);
params.put("newId", newId);
// 2. 复制 jh 关联从表
sjDjjcMapper.copySjDcfxDzfc(params);
sjDjjcMapper.copySjDcfxTsyx(params);
sjDjjcMapper.copySjDzfc(params);
sjDjjcMapper.copySjFdfx(params);
sjDjjcMapper.copySjFdsgcs(params);
sjDjjcMapper.copySjFdsgcsDcylZjymdsjb(params);
sjDjjcMapper.copySjFdsgcsDcylZjymdtjb(params);
sjDjjcMapper.copySjFdsgcsDcyx(params);
sjDjjcMapper.copySjFdsgcsTsgj(params);
sjDjjcMapper.copySjFdsgcsZjfxzt(params);
sjDjjcMapper.copySjFdsgcsZjyFdxnb(params);
sjDjjcMapper.copySjFl(params);
sjDjjcMapper.copySjGztz(params);
sjDjjcMapper.copySjH2s(params);
sjDjjcMapper.copySjHse(params);
sjDjjcMapper.copySjJhzq(params);
sjDjjcMapper.copySjJkzp(params);
sjDjjcMapper.copySjJsjg(params);
sjDjjcMapper.copySjJygjGdfdcs(params);
sjDjjcMapper.copySjJygjGdsjgdcs(params);
sjDjjcMapper.copySjJygjInfo(params);
sjDjjcMapper.copySjJygjgdsj(params);
sjDjjcMapper.copySjLjjw(params);
sjDjjcMapper.copySjLjsm(params);
sjDjjcMapper.copySjLjtjzt(params);
sjDjjcMapper.copySjLjzjysyqk(params);
sjDjjcMapper.copySjQkztfx(params);
sjDjjcMapper.copySjSggyGjsbxnyq(params);
sjDjjcMapper.copySjSggyZjyCljl(params);
sjDjjcMapper.copySjSggyZjyFdsj(params);
sjDjjcMapper.copySjSggyZjyFdxnb(params);
sjDjjcMapper.copySjSggyZjzhcs(params);
sjDjjcMapper.copySjSzfxjg(params);
sjDjjcMapper.copySjTgTgqdjh(params);
sjDjjcMapper.copySjTgTgxnsj(params);
sjDjjcMapper.copySjTgTgz(params);
sjDjjcMapper.copySjZjcsxx(params);
sjDjjcMapper.copySjZjyCljl(params);
sjDjjcMapper.copySjZjyFdsj(params);
sjDjjcMapper.copySjZjyFdxnb(params);
sjDjjcMapper.copySjZlyq(params);
sjDjjcMapper.copySjZlyqXx(params);
sjDjjcMapper.copySjZlyqZbyq(params);
sjDjjcMapper.copySjZqfx(params);
sjDjjcMapper.copySjZsjqk(params);
sjDjjcMapper.copySjZtcsxx(params);
sjDjjcMapper.copySjZtgjsj(params);
sjDjjcMapper.copySjZtxx(params);
sjDjjcMapper.copySjZysx(params);
// 3. 复制 zbid 关联从表
sjDjjcMapper.copySjFdsgcsDcyxt(params);
sjDjjcMapper.copySjFzqkms(params);
sjDjjcMapper.copySjGcjbsj(params);
sjDjjcMapper.copySjJsjgt(params);
sjDjjcMapper.copySjLjfzqk(params);
sjDjjcMapper.copySjLjzjyfzqk(params);
sjDjjcMapper.copySjNdxm(params);
sjDjjcMapper.copySjBcxx(params);
return AjaxResult.success("复制成功");
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment