|
@@ -40,18 +40,17 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
|
|
|
String roughCoeName=this.getA_d10002().getRoughCoeName();
|
|
|
String code =this.getA_d10002().getCode();
|
|
|
|
|
|
-
|
|
|
String gfid = this.getA_d10002().getGfid();
|
|
|
String bfid = this.getA_d10002().getBfid();
|
|
|
SysFileMapper sysFileMapper = UtilTools.getBean(SysFileMapper.class);
|
|
|
SysFile gf = sysFileMapper.selectByPrimaryKey(gfid);
|
|
|
- if (gf == null) {
|
|
|
- throw new BusinessException("EB3100020");
|
|
|
- }
|
|
|
+// if (gf == null) {
|
|
|
+//// throw new BusinessException("EB3100020");
|
|
|
+// }
|
|
|
SysFile bf = sysFileMapper.selectByPrimaryKey(bfid);
|
|
|
- if (bf == null) {
|
|
|
- throw new BusinessException("EB3100021");
|
|
|
- }
|
|
|
+// if (bf == null) {
|
|
|
+//// throw new BusinessException("EB3100021");
|
|
|
+// }
|
|
|
|
|
|
DNodeMapper nodeMapper =UtilTools.getBean(DNodeMapper.class);
|
|
|
DNode sNode = nodeMapper.selectByPrimaryKey(snId);
|
|
@@ -107,11 +106,16 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
|
|
|
pipe.setSectionPara4(Float.valueOf(!StringUtil.isEmpty(sectionPara4)?sectionPara4:"0"));
|
|
|
pipe.setSectionPara5(Float.valueOf(!StringUtil.isEmpty(sectionPara5)?sectionPara5:"0"));
|
|
|
pipe.setCode(code);
|
|
|
- pipe.setGfid(gf.getId());
|
|
|
- pipe.setGfname(gf.getFilename());
|
|
|
- pipe.setBfid(bf.getId());
|
|
|
- pipe.setBfname(bf.getFilename());
|
|
|
pipe.setRoughCoeName(roughCoeName);
|
|
|
+ if(gf!=null){
|
|
|
+ pipe.setGfid(gf.getId());
|
|
|
+ pipe.setGfname(gf.getFilename());
|
|
|
+
|
|
|
+ }
|
|
|
+ if(bf!=null){
|
|
|
+ pipe.setBfid(bf.getId());
|
|
|
+ pipe.setBfname(bf.getFilename());
|
|
|
+ }
|
|
|
dPipeDao.updateByPrimaryKey(pipe);
|
|
|
}
|
|
|
|
|
@@ -142,10 +146,14 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
|
|
|
pipe.setSectionPara4(Float.valueOf(!StringUtil.isEmpty(sectionPara4)?sectionPara4:"0"));
|
|
|
pipe.setSectionPara5(Float.valueOf(!StringUtil.isEmpty(sectionPara5)?sectionPara5:"0"));
|
|
|
pipe.setCode(code);
|
|
|
- pipe.setGfid(gf.getId());
|
|
|
- pipe.setGfname(gf.getFilename());
|
|
|
- pipe.setBfid(bf.getId());
|
|
|
- pipe.setBfname(bf.getFilename());
|
|
|
+ if(gf!=null){
|
|
|
+ pipe.setGfid(gf.getId());
|
|
|
+ pipe.setGfname(gf.getFilename());
|
|
|
+ }
|
|
|
+ if(bf!=null){
|
|
|
+ pipe.setBfid(bf.getId());
|
|
|
+ pipe.setBfname(bf.getFilename());
|
|
|
+ }
|
|
|
pipe.setRoughCoeName(roughCoeName);
|
|
|
dPipeDao.insertSelective(pipe);
|
|
|
}
|