|
@@ -122,6 +122,150 @@ public class WmDaPharmacyServiceImpl extends ServiceImpl<WmDaPharmacyMapper, WmD
|
|
return R.ok(result);
|
|
return R.ok(result);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ public R updateByapprovalForManualOperation(Map<String, String> map) {
|
|
|
|
+ String taskId=map.get("taskId");
|
|
|
|
+ WmTask wmTask=wmTaskService.getById(taskId);
|
|
|
|
+ if(wmTask==null){
|
|
|
|
+ return R.failed("未查询到调查信息");
|
|
|
|
+ }
|
|
|
|
+ String approvalInfo=map.get("approvalInfo");
|
|
|
|
+ String approvalOpinion=map.get("approvalOpinion");
|
|
|
|
+ String compareResult=map.get("compareResult");
|
|
|
|
+ //更新时,同一个task_content_id和createtime下的数据,都要更新状态为已审核
|
|
|
|
+// LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<WmTask>();
|
|
|
|
+// updateWrapper.set(WmTask::getPlatAuditStatus,"1");
|
|
|
|
+// updateWrapper.set(WmTask::getApprovalOpinion,approvalOpinion);
|
|
|
|
+// updateWrapper.set(WmTask::getCompareResult,compareResult);
|
|
|
|
+// updateWrapper.set(WmTask::getApprovalInfo,approvalInfo);
|
|
|
|
+// updateWrapper.eq(WmTask::getTaskContentId,wmTask.getTaskContentId());
|
|
|
|
+// updateWrapper.eq(WmTask::getCreateTime,wmTask.getCreateTime());
|
|
|
|
+
|
|
|
|
+// WmTask updateTask = new WmTask();
|
|
|
|
+// updateTask.setId(taskId);
|
|
|
|
+// updateTask.setPlatAuditStatus("1");
|
|
|
|
+// updateTask.setApprovalOpinion(approvalOpinion);
|
|
|
|
+// updateTask.setCompareResult(compareResult);
|
|
|
|
+// updateTask.setApprovalInfo(approvalInfo);
|
|
|
|
+
|
|
|
|
+ if("1".equals(approvalOpinion)){//采纳
|
|
|
|
+ //updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
|
|
|
|
+ // TODO 根据任务积分修改积分包状态
|
|
|
|
+// updateWrapper.set(WmTask::getRealFlag,"0");//0审核通过
|
|
|
|
+// updateTask.setRealFlag("0");
|
|
|
|
+
|
|
|
|
+ WmDaPharmacy wmDaPharmacy = new WmDaPharmacy();
|
|
|
|
+ WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
|
|
|
|
+ //更新审核信息
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
|
+// Integer userId = SecurityUtils.getUser().getId();
|
|
|
|
+ if("1".equals(compareResult)){//新增
|
|
|
|
+ //新增
|
|
|
|
+ wmDaPharmacy.setPharmacyName(wmTaskContent.getTemp3());//名称
|
|
|
|
+ wmDaPharmacy.setAddress(wmTaskContent.getTemp4());//名称
|
|
|
|
+ if (!StringUtil.isEmpty(wmTaskContent.getTemp7())) {//省市区
|
|
|
|
+ String[] citys = wmTaskContent.getTemp7().split("-");
|
|
|
|
+ if(citys.length==3) {
|
|
|
|
+ wmDaPharmacy.setProvince(citys[0]);
|
|
|
|
+ wmDaPharmacy.setCity(citys[1]);
|
|
|
|
+ wmDaPharmacy.setArea(citys[2]);
|
|
|
|
+ }else {
|
|
|
|
+ String[] citys1=wmTaskContent.getTemp7().split(",");
|
|
|
|
+ if(citys1.length==3) {
|
|
|
|
+ wmDaPharmacy.setProvince(citys1[0]);
|
|
|
|
+ wmDaPharmacy.setCity(citys1[1]);
|
|
|
|
+ wmDaPharmacy.setArea(citys1[2]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ wmDaPharmacy.setCreateTime(now);
|
|
|
|
+ wmDaPharmacy.setCreateUser(0);
|
|
|
|
+ // 根据地址转换经纬度
|
|
|
|
+ this.convertToLatAndLong(wmDaPharmacy);
|
|
|
|
+ this.save(wmDaPharmacy);
|
|
|
|
+ }else if("2".equals(compareResult)){//信息不一致
|
|
|
|
+ //对比药店和调研信息,只有所属地区不一样
|
|
|
|
+// List<WmDaPharmacy> wdplist=wmDaPharmacyMapper.slectByParam(wmTaskContent.getTemp3());
|
|
|
|
+// if(null!=wdplist&&wdplist.size()>0){
|
|
|
|
+// wmDaPharmacy=wdplist.get(0);
|
|
|
|
+// }
|
|
|
|
+// String address=wmDaPharmacy.getProvince()+"-"+wmDaPharmacy.getCity()+"-"+wmDaPharmacy.getArea();
|
|
|
|
+// if(null!=wmTaskContent.getTemp7()&&!wmTaskContent.getTemp7().equals(address)){
|
|
|
|
+// String[] citys=wmTaskContent.getTemp7().split("-");
|
|
|
|
+// if(citys.length==3){
|
|
|
|
+// wmDaPharmacy.setProvince(citys[0]);
|
|
|
|
+// wmDaPharmacy.setCity(citys[1]);
|
|
|
|
+// wmDaPharmacy.setArea(citys[2]);
|
|
|
|
+// }else {
|
|
|
|
+// String[] citys1=wmTaskContent.getTemp7().split(",");
|
|
|
|
+// if(citys1.length==3) {
|
|
|
|
+// wmDaPharmacy.setProvince(citys1[0]);
|
|
|
|
+// wmDaPharmacy.setCity(citys1[1]);
|
|
|
|
+// wmDaPharmacy.setArea(citys1[2]);
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// wmDaPharmacy.setId(map.get("infoId"));
|
|
|
|
+// wmDaPharmacy.setPharmacyName(wmTaskContent.getTemp3());//名称
|
|
|
|
+// wmDaPharmacy.setAddress(wmTaskContent.getTemp4());
|
|
|
|
+// wmDaPharmacy.setUpdateTime(now);
|
|
|
|
+// wmDaPharmacy.setUpdateUser(userId);
|
|
|
|
+ // 根据地址转换经纬度
|
|
|
|
+// this.convertToLatAndLong(wmDaPharmacy);
|
|
|
|
+ //更新药店信息;
|
|
|
|
+// this.updateById(wmDaPharmacy);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+ //updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
|
|
|
|
+// updateWrapper.set(WmTask::getRealFlag,"1");//1不通过
|
|
|
|
+
|
|
|
|
+// updateTask.setRealFlag("1");
|
|
|
|
+ }
|
|
|
|
+ //提交
|
|
|
|
+// updateTask.setTaskStatus("2");
|
|
|
|
+ WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
|
|
|
|
+// if("1".equals(approvalOpinion)){
|
|
|
|
+// if("1".equals(wmScorePackage.getPackageType1())){
|
|
|
|
+// Boolean fullFlag = wmTaskService.checkUserTaskSubScore(wmTask.getTaskUserId());
|
|
|
|
+// if(fullFlag){
|
|
|
|
+// // return R.failed(1, "每日最多提交5万积分");
|
|
|
|
+// updateTask.setScore(0);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// wmTaskService.updateById(updateTask);
|
|
|
|
+// wmTaskService.update(updateWrapper);
|
|
|
|
+
|
|
|
|
+// if("1".equals(approvalOpinion)){
|
|
|
|
+//
|
|
|
|
+// }else {
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 审核不通过可能需要释放积分
|
|
|
|
+ */
|
|
|
|
+ //更新积分包状态
|
|
|
|
+// WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
|
|
|
|
+ WmScorePackageStatus query = new WmScorePackageStatus();
|
|
|
|
+ query.setUserId(wmTask.getTaskUserId());
|
|
|
|
+ query.setPackageId(wmTask.getScorePackageId());
|
|
|
|
+ query.setStatus("2");
|
|
|
|
+ WmScorePackageStatus scorePackageStatus = packageStatusService.getOne(Wrappers.query(query));
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 不需要释放 直接返回
|
|
|
|
+ */
|
|
|
|
+// if("1".equals(wmScorePackage.getTaskAddFlag()) && "1".equals(scorePackageStatus.getTaskAddFlag())){
|
|
|
|
+// return R.ok();
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+// packageStatusService.updatePackageAndStatus(wmTask, wmScorePackage, scorePackageStatus);
|
|
|
|
+// }
|
|
|
|
+ return R.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public R updateByapproval(Map<String, String> map) {
|
|
public R updateByapproval(Map<String, String> map) {
|