|
@@ -106,7 +106,7 @@ public class TFieldworkTjServiceImpl implements ITFieldworkTjService {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public TFieldworkTj selectTFieldworkTjInfo(String fieldworkId, String dkid, String auditflowStep, String auditflowId) {
|
|
public TFieldworkTj selectTFieldworkTjInfo(String fieldworkId, String dkid, String auditflowStep, String auditflowId) {
|
|
|
- if (StringUtils.isNotEmpty(fieldworkId) && StringUtils.isNotEmpty(dkid)) {
|
|
|
|
|
|
|
+ if (StringUtils.isEmpty(fieldworkId) && StringUtils.isEmpty(dkid)) {
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isEmpty(auditflowStep)) {
|
|
if (StringUtils.isEmpty(auditflowStep)) {
|
|
@@ -188,6 +188,7 @@ public class TFieldworkTjServiceImpl implements ITFieldworkTjService {
|
|
|
ret.setDkjbxxId(dkid);
|
|
ret.setDkjbxxId(dkid);
|
|
|
ret.setDecide(decide);
|
|
ret.setDecide(decide);
|
|
|
ret.setNotes(JSON.toJSONString(notes));
|
|
ret.setNotes(JSON.toJSONString(notes));
|
|
|
|
|
+ ret.setFieldworkId(fieldworkId);
|
|
|
return ret;
|
|
return ret;
|
|
|
} else {
|
|
} else {
|
|
|
return null;
|
|
return null;
|