修改 calendar 表相关字段 部分关联

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -46,7 +46,7 @@ import com.factory.web.entity.fa.res.UserListRes;
 import com.factory.web.entity.pm.OnsiteApprovalPlan;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
-import com.factory.web.entity.vo.req.exportInitialPlanDetailsReq;
+import com.factory.web.entity.vo.req.ExportInitialPlanDetailsReq;
 import com.factory.web.service.fa.FirstArticleService;
 import com.factory.web.service.pm.PreventMistakeService;
 
@@ -215,7 +215,7 @@ public class FirstArticleController {
 
 	@ApiOperation(value = "首件受控文件Excel")
 	@PostMapping("/exportInitialPlanDetails")
-	public ResponseBean<FileRes> exportInitialPlanDetails(@RequestBody exportInitialPlanDetailsReq req) {
+	public ResponseBean<FileRes> exportInitialPlanDetails(@RequestBody ExportInitialPlanDetailsReq req) {
 		return firstArticleService.exportInitialPlanDetails(req);
 	}
 

application-facade/src/main/java/com/factory/controller/web/InitialPlanWebController.java

@@ -113,7 +113,7 @@ public class InitialPlanWebController {
 
     @ApiOperation(value = "首件计划导出excel")
     @PostMapping("/exportInitialPlan")
-    public ResponseBean<FileRes> exportInitialPlan(@RequestBody exportInitialPlanReq req) {
+    public ResponseBean<FileRes> exportInitialPlan(@RequestBody ExportInitialPlanReq req) {
         return bentelerIniVersionService.exportInitialPlan(req);
     }
 

application-facade/src/main/java/com/factory/web/entity/vo/req/exportInitialPlanDetailsReq.java → application-facade/src/main/java/com/factory/web/entity/vo/req/ExportInitialPlanDetailsReq.java

@@ -19,8 +19,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonInclude()
-@ApiModel(value = "exportInitialPlanDetailsReq", description = "")
-public class exportInitialPlanDetailsReq {
+@ApiModel(value = "ExportInitialPlanDetailsReq", description = "")
+public class ExportInitialPlanDetailsReq {
 
     @ApiModelProperty(value = "收件计划id")
     private Long IniPlnaId;

application-facade/src/main/java/com/factory/web/entity/vo/req/web/exportInitialPlanReq.java → application-facade/src/main/java/com/factory/web/entity/vo/req/web/ExportInitialPlanReq.java

@@ -20,7 +20,7 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @AllArgsConstructor
 
-public class exportInitialPlanReq extends BaseIdReq {
+public class ExportInitialPlanReq extends BaseIdReq {
     @ApiModelProperty(value = "过滤时间日期")
     private LocalDate chooseDate;
 

application-facade/src/main/java/com/factory/web/service/fa/FirstArticleService.java

@@ -12,7 +12,7 @@ import com.factory.web.entity.fa.FirstArticleWorkshop;
 import com.factory.web.entity.fa.req.*;
 import com.factory.web.entity.fa.res.*;
 import com.factory.web.entity.pm.ApprovalRule;
-import com.factory.web.entity.vo.req.exportInitialPlanDetailsReq;
+import com.factory.web.entity.vo.req.ExportInitialPlanDetailsReq;
 
 import java.util.List;
 
@@ -241,7 +241,7 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 
     ResponseBean<FileRes> exportFaCheckRecordList(SearchFaCheckRecordListReq req);
 
-    ResponseBean<FileRes> exportInitialPlanDetails(exportInitialPlanDetailsReq req);
+    ResponseBean<FileRes> exportInitialPlanDetails(ExportInitialPlanDetailsReq req);
 
     /**
      * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import com.factory.web.entity.vo.req.ExportInitialPlanDetailsReq;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,7 +89,6 @@ import com.factory.web.entity.fa.res.FaWorkshopNoGoListRes;
 import com.factory.web.entity.fa.res.UserListRes;
 import com.factory.web.entity.pm.ApprovalRule;
 import com.factory.web.entity.pm.OnsiteApprovalPlan;
-import com.factory.web.entity.vo.req.exportInitialPlanDetailsReq;
 import com.factory.web.mapper.fa.FirstArticleMapper;
 import com.factory.web.mapper.pm.ApprovalRuleMapper;
 import com.factory.web.service.BentelerPlanService;
@@ -1414,7 +1414,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     }
 
     @Override
-    public ResponseBean<FileRes> exportInitialPlanDetails(exportInitialPlanDetailsReq req) {
+    public ResponseBean<FileRes> exportInitialPlanDetails(ExportInitialPlanDetailsReq req) {
 
         Long bentelerPlanId = req.getIniPlnaId();
         BentelerPlan plan = planService.getById(bentelerPlanId);

application-facade/src/main/java/com/factory/web/service/impl/ini/BentelerIniVersionServiceImpl.java

@@ -749,7 +749,7 @@ public class BentelerIniVersionServiceImpl extends ServiceImpl<BentelerIniVersio
     }
 
     @Override
-    public ResponseBean<FileRes> exportInitialPlan(exportInitialPlanReq req) {
+    public ResponseBean<FileRes> exportInitialPlan(ExportInitialPlanReq req) {
         Long versionId = req.getId();
         getCheckResutGreadReq resutGreadReq = getCheckResutGreadReq.builder()
                 .localDate(req.getChooseDate())

application-facade/src/main/java/com/factory/web/service/ini/BentelerIniVersionService.java

@@ -72,7 +72,7 @@ public interface BentelerIniVersionService extends IService<BentelerIniVersion>
 
     boolean planNameRepetition(String name);
 
-    ResponseBean<FileRes> exportInitialPlan(exportInitialPlanReq req);
+    ResponseBean<FileRes> exportInitialPlan(ExportInitialPlanReq req);
 
     List<getCheckResutGreadRes> getCheckResutGread(getCheckResutGreadReq req);