|
@@ -10,6 +10,7 @@ import com.rongwei.bsentity.domain.QhsePointsRecordUserDo;
|
|
|
import com.rongwei.bsentity.domain.QhsePointsRedemptionDo;
|
|
|
import com.rongwei.rwadmincommon.system.vo.SysUserVo;
|
|
|
import com.rongwei.rwcommon.base.R;
|
|
|
+import com.rongwei.rwcommon.utils.SecurityUtil;
|
|
|
import com.rongwei.rwcommon.utils.StringUtils;
|
|
|
import org.apache.commons.lang.ArrayUtils;
|
|
|
import org.slf4j.Logger;
|
|
@@ -79,11 +80,11 @@ public class PointServiceImpl implements PointService {
|
|
|
for (QhseContractWorkersDo uninitializedDatum : uninitializedData) {
|
|
|
qhsePointsRecordUserDo = new QhsePointsRecordUserDo();
|
|
|
QHSEUtils.initModelGeneralParameters(qhsePointsRecordUserDo, currentUser);
|
|
|
- qhsePointsRecordUserDo.setId(uninitializedDatum.getId());
|
|
|
+ qhsePointsRecordUserDo.setId(SecurityUtil.getUUID());
|
|
|
qhsePointsRecordUserDo.setPointyear(year);
|
|
|
- qhsePointsRecordUserDo.setHoldername(qhsePointsRecordUserDo.getHoldername());
|
|
|
- qhsePointsRecordUserDo.setHolderid(qhsePointsRecordUserDo.getId());
|
|
|
- qhsePointsRecordUserDo.setHolderaccount(qhsePointsRecordUserDo.getHolderaccount());
|
|
|
+ qhsePointsRecordUserDo.setHoldername(uninitializedDatum.getWorkername());
|
|
|
+ qhsePointsRecordUserDo.setHolderid(uninitializedDatum.getId());
|
|
|
+ qhsePointsRecordUserDo.setHolderaccount(uninitializedDatum.getWorknumber());
|
|
|
qhsePointsRecordUserDo.setCurrentpoint(100);
|
|
|
qhsePointsRecordUserDo.setBonuspoints(0);
|
|
|
qhsePointsRecordUserDo.setDeductpoints(0);
|