提交 5e5411b3 authored 作者: 000516's avatar 000516 提交者: Coding

创建/修改/查询稽查任务时,jsonarray与varchar两对象之间相互转换

Merge Request: 创建/修改/查询稽查任务时,jsonarray与varchar两对象之间相互转换 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/260?initial=true
package com.wangxiaolu.promotion.controller.activity.examine; package com.wangxiaolu.promotion.controller.activity.examine;
import com.alibaba.fastjson.JSONObject;
import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto; import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
import com.wangxiaolu.promotion.pojo.activity.examine.vo.ExaPlanVo; import com.wangxiaolu.promotion.pojo.activity.examine.vo.ExaPlanVo;
import com.wangxiaolu.promotion.result.basedata.R; import com.wangxiaolu.promotion.result.basedata.R;
......
package com.wangxiaolu.promotion.domain.examine.dao.impl; package com.wangxiaolu.promotion.domain.examine.dao.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wangxiaolu.promotion.common.util.BeanUtils; import com.wangxiaolu.promotion.common.util.BeanUtils;
...@@ -31,13 +32,13 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao { ...@@ -31,13 +32,13 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
@Override @Override
public ActivityExamineDto selectById(Long id) { public ActivityExamineDto selectById(Long id) {
ActivityExamineDO activityExamineDO = activityExamineMapper.selectById(id); ActivityExamineDO activityExamineDO = activityExamineMapper.selectById(id);
return BeanUtils.transitionDto(activityExamineDO, ActivityExamineDto.class); return returnDo(activityExamineDO);
} }
@Override @Override
public ActivityExamineDto selectByPlanId(Long planId) { public ActivityExamineDto selectByPlanId(Long planId) {
ActivityExamineDO examineDO = activityExamineMapper.selectByPlanId(planId); ActivityExamineDO examineDO = activityExamineMapper.selectByPlanId(planId);
return BeanUtils.transitionDto(examineDO, ActivityExamineDto.class); return returnDo(examineDO);
} }
@Override @Override
...@@ -48,7 +49,7 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao { ...@@ -48,7 +49,7 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
arrayToStringByDo(examineDO, examineDto); arrayToStringByDo(examineDO, examineDto);
activityExamineMapper.insert(examineDO); activityExamineMapper.insert(examineDO);
ActivityExamineDO examineDO1 = activityExamineMapper.selectById(examineDO.getId()); ActivityExamineDO examineDO1 = activityExamineMapper.selectById(examineDO.getId());
return BeanUtils.transitionDto(examineDO1, ActivityExamineDto.class); return returnDo(examineDO1);
} catch (Exception e) { } catch (Exception e) {
String eMsg = e.getCause().getMessage(); String eMsg = e.getCause().getMessage();
if (eMsg.contains("for key 'plan_id_unique'")) { if (eMsg.contains("for key 'plan_id_unique'")) {
...@@ -65,7 +66,7 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao { ...@@ -65,7 +66,7 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
arrayToStringByDo(examineDO,examineDto); arrayToStringByDo(examineDO,examineDto);
activityExamineMapper.updateById(examineDO); activityExamineMapper.updateById(examineDO);
ActivityExamineDO examineDO1 = activityExamineMapper.selectById(examineDO.getId()); ActivityExamineDO examineDO1 = activityExamineMapper.selectById(examineDO.getId());
return BeanUtils.transitionDto(examineDO1, ActivityExamineDto.class); return returnDo(examineDO1);
} }
@Override @Override
...@@ -89,11 +90,20 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao { ...@@ -89,11 +90,20 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
} }
private void arrayToStringByDo(ActivityExamineDO examineDO,ActivityExamineDto examineDto){ private ActivityExamineDto returnDo(ActivityExamineDO activityExamineDO) {
examineDO.setReportedIds(JSONObject.toJSONString(examineDto.getReportedIds())); ActivityExamineDto dto = BeanUtils.transitionDto(activityExamineDO, ActivityExamineDto.class);
examineDO.setClockIds(JSONObject.toJSONString(examineDto.getClockIds())); dto.setReportedIds(Objects.isNull(activityExamineDO.getReportedIds()) ? null : JSONArray.parseArray(activityExamineDO.getReportedIds()));
examineDO.setTemWorkPhotos(JSONObject.toJSONString(examineDto.getTemWorkPhotos())); dto.setClockIds(Objects.isNull(activityExamineDO.getClockIds()) ? null : JSONArray.parseArray(activityExamineDO.getClockIds()));
examineDO.setPosPhotos(JSONObject.toJSONString(examineDto.getPosPhotos())); dto.setTemWorkPhotos(Objects.isNull(activityExamineDO.getTemWorkPhotos()) ? null : JSONArray.parseArray(activityExamineDO.getTemWorkPhotos()));
dto.setPosPhotos(Objects.isNull(activityExamineDO.getPosPhotos()) ? null : JSONArray.parseArray(activityExamineDO.getPosPhotos()));
return dto;
}
private void arrayToStringByDo(ActivityExamineDO examineDO, ActivityExamineDto examineDto) {
examineDO.setReportedIds(Objects.isNull(examineDto.getReportedIds()) ? null : JSONObject.toJSONString(examineDto.getReportedIds()));
examineDO.setClockIds(Objects.isNull(examineDto.getClockIds()) ? null : JSONObject.toJSONString(examineDto.getClockIds()));
examineDO.setTemWorkPhotos(Objects.isNull(examineDto.getTemWorkPhotos()) ? null : JSONObject.toJSONString(examineDto.getTemWorkPhotos()));
examineDO.setPosPhotos(Objects.isNull(examineDto.getPosPhotos()) ? null : JSONObject.toJSONString(examineDto.getPosPhotos()));
} }
} }
...@@ -52,12 +52,12 @@ public class ActivityExamineDto { ...@@ -52,12 +52,12 @@ public class ActivityExamineDto {
/** /**
* 上报ID * 上报ID
*/ */
private String reportedIds; private JSONArray reportedIds;
/** /**
* 打卡ID * 打卡ID
*/ */
private String clockIds; private JSONArray clockIds;
/** /**
* 所属战区名称 * 所属战区名称
...@@ -142,7 +142,7 @@ public class ActivityExamineDto { ...@@ -142,7 +142,7 @@ public class ActivityExamineDto {
/** /**
* 工作取证照片 * 工作取证照片
*/ */
private String temWorkPhotos; private JSONArray temWorkPhotos;
/** /**
* 特陈照 * 特陈照
...@@ -162,7 +162,7 @@ public class ActivityExamineDto { ...@@ -162,7 +162,7 @@ public class ActivityExamineDto {
/** /**
* pos照片 * pos照片
*/ */
private String posPhotos; private JSONArray posPhotos;
/** /**
* *
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论