|
@@ -87,6 +87,8 @@ public class LisSyncService {
|
|
|
scienceApply.setPetType(item.getLisPetTypeId());
|
|
|
scienceApply.setCreateId(applyUser.getStr("user_id"));
|
|
|
scienceApply.setCreateName(sampleInfo.getApplicantName());
|
|
|
+ scienceApply.setApplyDocId(scienceApply.getCreateId());
|
|
|
+ scienceApply.setApplyDoc(scienceApply.getCreateName());
|
|
|
scienceApply.setEmail(StrUtil.nullToDefault(serum.getApplyUserEmail(), sampleInfo.getApplicantEmail()));
|
|
|
scienceApply.setPhone(StrUtil.nullToDefault(serum.getApplyUserMobile(), sampleInfo.getApplicantPhone()));
|
|
|
|
|
@@ -94,6 +96,10 @@ public class LisSyncService {
|
|
|
scienceApply.setHspId(depMap.get(serum.getSendOrgId()).getStr("hsp_id"));
|
|
|
scienceApply.setApplyDep(serum.getSendOrgId().toString());
|
|
|
}
|
|
|
+ if (serum.getSendOrgId() != null) {
|
|
|
+ scienceApply.setDeliverOperId(serum.getSendUserId().toString());
|
|
|
+ scienceApply.setDeliverOper(serum.getSendUserName());
|
|
|
+ }
|
|
|
if (item.getLisSampleTypeId() != null) {
|
|
|
scienceApply.setSampleId(item.getLisSampleTypeId().toString());
|
|
|
}
|
|
@@ -118,12 +124,7 @@ public class LisSyncService {
|
|
|
if (StrUtil.isNotBlank(item.getQuick())) {
|
|
|
scienceApply.setFastFlag(Integer.parseInt(item.getQuick()));
|
|
|
}
|
|
|
- if (serum.getSendUserId() != null) {
|
|
|
- scienceApply.setApplyDocId(serum.getSendUserId().toString());
|
|
|
- scienceApply.setDeliverOperId(serum.getSendUserId().toString());
|
|
|
- }
|
|
|
- scienceApply.setApplyDoc(serum.getSendUserName());
|
|
|
- scienceApply.setDeliverOper(serum.getSendUserName());
|
|
|
+
|
|
|
scienceApply.setApplyTime(new DateTime(item.getApplyDate()));
|
|
|
scienceApply.setDeliverTime(new DateTime(item.getSendDate()));
|
|
|
scienceApply.setSampleCount(Integer.parseInt(item.getNum()));
|