|
@@ -28,10 +28,9 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.stereotype.Component;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import javax.validation.constraints.NotBlank;
|
|
|
import java.sql.Timestamp;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.Date;
|
|
@@ -43,34 +42,54 @@ import java.util.Map;
|
|
|
* @date 2021/5/26
|
|
|
* @desc 审批信息保存
|
|
|
*/
|
|
|
-@Service
|
|
|
+@Component
|
|
|
public class ApproveUploadBusinessImpl implements IApproveUploadBusiness {
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(ApproveUploadBusinessImpl.class);
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveRecordService approveRecordService;
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveQueryRelationService approveQueryRelationService;
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveCirculationService approveCirculationService;
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveActHiTaskService approveActHiTaskService;
|
|
|
|
|
|
- @Autowired
|
|
|
private ApproveProperties approveProperties;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ public void setApproveRecordService(IApproveRecordService approveRecordService) {
|
|
|
+ this.approveRecordService = approveRecordService;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveQueryRelationService(IApproveQueryRelationService approveQueryRelationService) {
|
|
|
+ this.approveQueryRelationService = approveQueryRelationService;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveCirculationService(IApproveCirculationService approveCirculationService) {
|
|
|
+ this.approveCirculationService = approveCirculationService;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveActHiTaskService(IApproveActHiTaskService approveActHiTaskService) {
|
|
|
+ this.approveActHiTaskService = approveActHiTaskService;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveProperties(ApproveProperties approveProperties) {
|
|
|
+ this.approveProperties = approveProperties;
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
public ResponseStatus approveUpload(List<ApproveRecordReportReqVO> approveRecordList) {
|
|
|
logger.info("审批单信息保存开始,数据推送条数:【{}】", approveRecordList.size());
|
|
|
try {
|
|
|
for (ApproveRecordReportReqVO approveRecord : approveRecordList) {
|
|
|
- @NotBlank String oldApproveNo = approveRecord.getApproveNo();
|
|
|
- @NotBlank String appCode = approveRecord.getAppCode();
|
|
|
+ String oldApproveNo = approveRecord.getApproveNo();
|
|
|
+ String appCode = approveRecord.getAppCode();
|
|
|
String newApproveNo = buildNewApproveNo(appCode, oldApproveNo);
|
|
|
ApproveRecordInfo approveRecordInfo = approveRecordService.selectByApproveNo(newApproveNo);
|
|
|
boolean isSave = false;
|
|
@@ -79,7 +98,7 @@ public class ApproveUploadBusinessImpl implements IApproveUploadBusiness {
|
|
|
isSave = true;
|
|
|
}
|
|
|
|
|
|
- @NotBlank String applicantIdcard = approveRecord.getApplicantIdcard();
|
|
|
+ String applicantIdcard = approveRecord.getApplicantIdcard();
|
|
|
Date applyTimeDate = DateUtils.parseDate(approveRecord.getApplyTime(), DateUtils.DATE_FORMAT_19);
|
|
|
|
|
|
BeanUtils.copyProperties(approveRecord, approveRecordInfo);
|