|
@@ -432,12 +432,15 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
|
|
|
|
|
|
// v.setWorkerName(workerIdCardMap.get(m.getSfzen()).get(0).getWorkerName());
|
|
|
|
|
|
- v.setStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
|
|
|
+ v.setReceOrderStatus(DictTypeEnum.DICT_TYPE_ON.getCode());
|
|
|
if (m.getFlag() != null){
|
|
|
if (!m.getFlag().trim().equals(DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())){
|
|
|
- v.setStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
|
|
|
+ v.setReceOrderStatus(DictTypeEnum.DICT_TYPE_OFF.getCode());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ v.setStatus("ON");
|
|
|
+
|
|
|
// 工程师类型
|
|
|
// v.setWorkerType();
|
|
|
// v.setBirthDate();
|
|
@@ -721,11 +724,13 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
|
|
|
v.setUpdateBy("system");
|
|
|
v.setCreateTime(new Date());
|
|
|
v.setUpdateTime(new Date());
|
|
|
- v.setStatus("OFF");
|
|
|
+ v.setStatus("ON");
|
|
|
if (flag){
|
|
|
- v.setStatus("ON");
|
|
|
v.setTestFlag("合格");
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
/*if (m.getCreatedBy() != null){
|
|
|
v.setCreateBy(m.getCreatedBy());
|
|
|
}
|