|
|
@@ -200,6 +200,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
* 新增数据
|
|
|
*
|
|
|
* @param taskDetails 实例对象
|
|
|
+ * @param type 0=初步新增,1=新增切同步日志
|
|
|
* @return 实例对象
|
|
|
*/
|
|
|
@Override
|
|
|
@@ -218,6 +219,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
//新增日志数据
|
|
|
if (type==1){
|
|
|
try {
|
|
|
+ pushFeature(taskDetails);
|
|
|
addTaskDetailsLog(taskDetails);
|
|
|
} catch (InvocationTargetException | IllegalAccessException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
@@ -226,6 +228,37 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
return taskDetails;
|
|
|
}
|
|
|
|
|
|
+ private void pushFeature(TaskDetails taskDetails) {
|
|
|
+ List<TaskFeature> list = taskFeatureMapper.selectByTdId(taskDetails.getId());
|
|
|
+ for (TaskFeature e : list) {
|
|
|
+ StringBuilder str=new StringBuilder();
|
|
|
+ String dateStr = DateUtils.formatDate(e.getStartTime(), "yyyy-MM-dd");
|
|
|
+ str.append(dateStr).append(" 检查部门(").append(e.getDepName()).append(") ");
|
|
|
+ String type=e.getInspectWay()==0?"线上":e.getInspectWay()==1?"线下":"无";
|
|
|
+ str.append(type).append(";");
|
|
|
+ if (e.getType()==1){
|
|
|
+ taskDetails.setFeatureHt(str.toString());
|
|
|
+ }else if (e.getType()==2){
|
|
|
+ taskDetails.setFeatureAd(str.toString());
|
|
|
+ }else if (e.getType()==3){
|
|
|
+ taskDetails.setFeatureTr(str.toString());
|
|
|
+ }else if (e.getType()==4){
|
|
|
+ taskDetails.setFeatureTe(str.toString());
|
|
|
+ }else if (e.getType()==5){
|
|
|
+ taskDetails.setFeatureTi(str.toString());
|
|
|
+ }else if (e.getType()==0){
|
|
|
+ taskDetails.setFeatureOther(str.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (StringUtils.isEmpty(taskDetails.getFeatureHt()))taskDetails.setFeatureHt("无");
|
|
|
+ if (StringUtils.isEmpty(taskDetails.getFeatureAd()))taskDetails.setFeatureAd("无");
|
|
|
+ if (StringUtils.isEmpty(taskDetails.getFeatureTr()))taskDetails.setFeatureTr("无");
|
|
|
+ if (StringUtils.isEmpty(taskDetails.getFeatureTe()))taskDetails.setFeatureTe("无");
|
|
|
+ if (StringUtils.isEmpty(taskDetails.getFeatureTi()))taskDetails.setFeatureTi("无");
|
|
|
+ if (StringUtils.isEmpty(taskDetails.getFeatureOther()))taskDetails.setFeatureOther("无");
|
|
|
+ taskDetailsMapper.update(taskDetails);
|
|
|
+ }
|
|
|
+
|
|
|
private void updateTask(TaskDetails taskDetails, String orderNo) {
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(orderNo, null);
|
|
|
List<TOrderTaskBo> collect = tOrderTaskBos.stream().filter(e -> e.getSplitStatus() == 0||e.getSplitStatus() == 2).collect(Collectors.toList());
|
|
|
@@ -343,6 +376,8 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
BigDecimal totalAmount = tOrderNew.getTotalAmount().divide(new BigDecimal(yearSum), 2, RoundingMode.HALF_UP);
|
|
|
Integer lvl=getOrderLvl(totalAmount);
|
|
|
taskDetails.setMemberLvl(lvl);
|
|
|
+ //设置特色工作
|
|
|
+ taskFeatureMapper.selectByTdId();
|
|
|
}
|
|
|
|
|
|
private BigDecimal getBigDecimal(BigDecimal rdSalesAmount, BigDecimal rdBudget, TaskDetails taskDetails) {
|
|
|
@@ -369,6 +404,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
//调用就保存,不需要区分不保存
|
|
|
// if (type !=null&&type==1){
|
|
|
try {
|
|
|
+ pushFeature(taskDetails);
|
|
|
addTaskDetailsLog(res);
|
|
|
} catch (InvocationTargetException | IllegalAccessException e) {
|
|
|
throw new RuntimeException(e);
|