|
@@ -1,40 +1,27 @@
|
|
|
package com.steerinfo.ems.emsprodplanround.controller;
|
|
|
|
|
|
import com.steerinfo.auth.utils.JwtUtil;
|
|
|
-import com.steerinfo.ems.Utils.DateUtils;
|
|
|
import com.steerinfo.ems.emsgmpcjh.mapper.EmsGmPcJhMapper;
|
|
|
import com.steerinfo.ems.emsgmpcjh.model.EmsGmPcJh;
|
|
|
import com.steerinfo.ems.emslog.enums.BusinessType;
|
|
|
-import com.steerinfo.ems.emslog.mapper.EmsLogMapper;
|
|
|
-import com.steerinfo.ems.emslog.model.EmsLog;
|
|
|
import com.steerinfo.ems.emslog.service.IEmsLogService;
|
|
|
-import com.steerinfo.ems.emsprodplanmonth.mapper.EmsProdplanMonthMapper;
|
|
|
-import com.steerinfo.ems.emsprodplanmonth.model.EmsProdplanMonth;
|
|
|
import com.steerinfo.ems.emsprodplanmonth.service.IEmsProdplanMonthService;
|
|
|
import com.steerinfo.ems.emsprodplanround.mapper.EmsProdplanRoundMapper;
|
|
|
-import com.steerinfo.ems.emsprodplanweightadjustment.model.EmsProdplanWeightAdjustment;
|
|
|
-import com.steerinfo.ems.emsprodplanyear.model.EmsProdplanYear;
|
|
|
+import com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound;
|
|
|
+import com.steerinfo.ems.emsprodplanround.service.IEmsProdplanRoundService;
|
|
|
import com.steerinfo.framework.controller.BaseRESTfulController;
|
|
|
import com.steerinfo.framework.controller.RESTfulResult;
|
|
|
import com.steerinfo.framework.service.pagehelper.PageList;
|
|
|
import com.steerinfo.framework.utils.collection.ListUtils;
|
|
|
-import com.steerinfo.ems.emsprodplanround.model.EmsProdplanRound;
|
|
|
-import com.steerinfo.ems.emsprodplanround.service.IEmsProdplanRoundService;
|
|
|
import com.steerinfo.framework.utils.misc.IdGenerator;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import lombok.val;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
-import org.apache.tools.ant.taskdefs.Get;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
-import java.math.BigDecimal;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -241,7 +228,8 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
|
|
|
return failed(null,"存在审核不通过的计划, 无法下发");
|
|
|
}
|
|
|
model.setState("1");
|
|
|
- emsProdplanRoundMapper.updateByPrimaryKey(model);
|
|
|
+ //emsProdplanRoundMapper.updateByPrimaryKey(model);
|
|
|
+ emsProdplanRoundMapper.updateByPrimaryKeySelective(model);
|
|
|
}
|
|
|
EmsProdplanRound sumPlanWeight = emsProdplanRoundService.getSumPlanWeight(id);
|
|
|
EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(monthid);
|
|
@@ -271,7 +259,8 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
|
|
|
return failed(null,"存在已经接收的计划,无法做取消下发操作,请重新刷新页面");
|
|
|
}
|
|
|
model.setState("0");
|
|
|
- emsProdplanRoundMapper.updateByPrimaryKey(model);
|
|
|
+ //emsProdplanRoundMapper.updateByPrimaryKey(model);
|
|
|
+ emsProdplanRoundMapper.updateByPrimaryKeySelective(model);
|
|
|
}
|
|
|
EmsProdplanRound sumPlanWeight = emsProdplanRoundService.getSumPlanWeight(id);
|
|
|
EmsGmPcJh emsGmPcJh = emsGmPcJhMapper.selectByPrimaryKey(monthid);
|