1.监督计划功能调整
2.全过程功能调整
This commit is contained in:
@@ -14,11 +14,8 @@ import com.njcn.harmonic.service.upload.IPmsTemProcessReportService;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
|
||||
import java.util.List;
|
||||
@@ -64,9 +61,9 @@ public class PmsTemProcessReportController extends BaseController {
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/dayCalReport")
|
||||
@ApiOperation("每日计算评估问题")
|
||||
public HttpResult<Boolean> dayCalReport() {
|
||||
public HttpResult<Boolean> dayCalReport(@RequestParam("date") String date) {
|
||||
String methodDescribe = getMethodDescribe("dayCalReport");
|
||||
iPmsTemProcessReportService.dayCalReport();
|
||||
iPmsTemProcessReportService.dayCalReport(date);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,5 +26,5 @@ public interface IPmsTemProcessReportService extends IService<PmsTemProcessRepor
|
||||
List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param);
|
||||
|
||||
|
||||
Boolean dayCalReport();
|
||||
Boolean dayCalReport(String date);
|
||||
}
|
||||
|
||||
@@ -100,11 +100,12 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean dayCalReport() {
|
||||
public Boolean dayCalReport(String date) {
|
||||
|
||||
DateTime beginTime = DateUtil.beginOfMonth(new Date());
|
||||
DateTime endTime = DateUtil.endOfMonth(new Date());
|
||||
String statisticalDate = DateUtil.format(new Date(),"yyyy-MM");
|
||||
DateTime dateTime = DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN);
|
||||
DateTime beginTime = DateUtil.beginOfMonth(dateTime);
|
||||
DateTime endTime = DateUtil.endOfMonth(dateTime);
|
||||
String statisticalDate = DateUtil.format(dateTime,"yyyy-MM");
|
||||
List<PmsTemProcessReport> pmsTemProcessReportList = new ArrayList<>();
|
||||
|
||||
List<PvTerminalTreeVO> data = deptFeignClient.allDeptList().getData();
|
||||
|
||||
Reference in New Issue
Block a user