Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.监督计划功能调整

Browse Source 
2.全过程功能调整
This commit is contained in:
chendaofei
2024-10-31 14:15:00 +08:00
parent 35d05dd3ac
commit d7e63ec2d5
5 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java
View File

@@ -14,11 +14,8 @@ import com.njcn.harmonic.service.upload.IPmsTemProcessReportService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController; import com.njcn.web.controller.BaseController;
import java.util.List; import java.util.List;
@@ -64,9 +61,9 @@ public class PmsTemProcessReportController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/dayCalReport") @PostMapping("/dayCalReport")
@ApiOperation("每日计算评估问题") @ApiOperation("每日计算评估问题")
public HttpResult<Boolean> dayCalReport() { public HttpResult<Boolean> dayCalReport(@RequestParam("date") String date) {
String methodDescribe = getMethodDescribe("dayCalReport"); String methodDescribe = getMethodDescribe("dayCalReport");
iPmsTemProcessReportService.dayCalReport(); iPmsTemProcessReportService.dayCalReport(date);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} }
} }

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java
View File

@@ -26,5 +26,5 @@ public interface IPmsTemProcessReportService extends IService<PmsTemProcessRepor
List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param); List<PmsTemProcessReport> getList(PmsTemUserParam.QueryPmsTemUserParam param);
Boolean dayCalReport(); Boolean dayCalReport(String date);
} }

9
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java
View File

@@ -100,11 +100,12 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessRep
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean dayCalReport() { public Boolean dayCalReport(String date) {
DateTime beginTime = DateUtil.beginOfMonth(new Date()); DateTime dateTime = DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN);
DateTime endTime = DateUtil.endOfMonth(new Date()); DateTime beginTime = DateUtil.beginOfMonth(dateTime);
String statisticalDate = DateUtil.format(new Date(),"yyyy-MM"); DateTime endTime = DateUtil.endOfMonth(dateTime);
String statisticalDate = DateUtil.format(dateTime,"yyyy-MM");
List<PmsTemProcessReport> pmsTemProcessReportList = new ArrayList<>(); List<PmsTemProcessReport> pmsTemProcessReportList = new ArrayList<>();
List<PvTerminalTreeVO> data = deptFeignClient.allDeptList().getData(); List<PvTerminalTreeVO> data = deptFeignClient.allDeptList().getData();

2
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlanRel.java
View File

@@ -11,7 +11,7 @@ import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.njcn.process.utils.TimestampAsLongSerializer;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

52
pqs-process/process-api/src/main/java/com/njcn/process/utils/TimestampAsLongSerializer.java
View File

@@ -1,26 +1,26 @@
package com.njcn.process.utils; //package com.njcn.process.utils;
//
import com.alibaba.fastjson.serializer.JSONSerializer; //import com.alibaba.fastjson.serializer.JSONSerializer;
import com.alibaba.fastjson.serializer.ObjectSerializer; //import com.alibaba.fastjson.serializer.ObjectSerializer;
//
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import java.io.IOException; //import java.io.IOException;
import java.lang.reflect.Type; //import java.lang.reflect.Type;
import java.sql.Timestamp; //import java.sql.Timestamp;
//
@Component //@Component
public class TimestampAsLongSerializer implements ObjectSerializer { //public class TimestampAsLongSerializer implements ObjectSerializer {
//
@Override // @Override
public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException { // public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
if (object instanceof Timestamp) { // if (object instanceof Timestamp) {
Timestamp timestamp = (Timestamp) object; // Timestamp timestamp = (Timestamp) object;
// 将Timestamp转换为时间戳（毫秒数） // // 将Timestamp转换为时间戳（毫秒数）
long time = timestamp.getTime(); // long time = timestamp.getTime();
serializer.write(time); // serializer.write(time);
} else { // } else {
serializer.write(object); // serializer.write(object);
} // }
} // }
} //}