deason 6 år sedan
förälder
incheckning
27fba54102

+ 0 - 18
examcloud-core-print-common/src/main/java/cn/com/qmth/examcloud/core/print/common/IdEntity.java

@@ -8,13 +8,11 @@
 package cn.com.qmth.examcloud.core.print.common;
 
 import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
-import java.util.Date;
 
 /**
  * ID Entity
@@ -36,20 +34,4 @@ public abstract class IdEntity extends JpaEntity {
         this.id = id;
     }
 
-    public IdEntity() {
-        super();
-    }
-
-    @Override
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getUpdateTime() {
-        return super.getUpdateTime();
-    }
-
-    @Override
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getCreationTime() {
-        return super.getCreationTime();
-    }
-
 }

+ 12 - 0
examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingProjectController.java

@@ -9,8 +9,14 @@ package cn.com.qmth.examcloud.core.print.api.controller;
 
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
+import cn.com.qmth.examcloud.core.print.service.bean.PrintingProjectInfo;
+import cn.com.qmth.examcloud.core.print.service.bean.PrintingProjectQuery;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+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.RestController;
 
@@ -27,4 +33,10 @@ public class PrintingProjectController extends ControllerSupport {
     @Autowired
     private PrintingProjectService printingProjectService;
 
+    @PostMapping("/list")
+    @ApiOperation(value = "查询印刷项目列表(分页)")
+    public Page<PrintingProjectInfo> getExamStudentList(@RequestBody PrintingProjectQuery query) {
+        return printingProjectService.getPrintingProjectList(query);
+    }
+
 }

+ 22 - 6
examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/provider/PrintingProjectCloudServiceProvider.java

@@ -9,11 +9,17 @@ package cn.com.qmth.examcloud.core.print.api.provider;
 
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.print.api.PrintingProjectCloudService;
-import cn.com.qmth.examcloud.core.print.api.request.PrintingProjectListReq;
-import cn.com.qmth.examcloud.core.print.api.response.PrintingProjectListResp;
+import cn.com.qmth.examcloud.core.print.api.bean.SyncPrintingProjectBean;
+import cn.com.qmth.examcloud.core.print.api.request.SyncPrintingProjectReq;
+import cn.com.qmth.examcloud.core.print.api.response.SyncPrintingProjectResp;
+import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
+import cn.com.qmth.examcloud.core.print.service.bean.PrintingProjectInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
 
@@ -30,10 +36,20 @@ public class PrintingProjectCloudServiceProvider extends ControllerSupport imple
     @Autowired
     private PrintingProjectService printingProjectService;
 
-    @Override
-    public PrintingProjectListResp printingProjectList(PrintingProjectListReq request) {
-        //to do
-        return new PrintingProjectListResp();
+    @PostMapping("/sync")
+    @ApiOperation(value = "同步更新印刷项目信息")
+    public SyncPrintingProjectResp syncPrintingProject(@RequestBody SyncPrintingProjectReq request) {
+        Check.isNull(request, "请求参数不能为空!");
+
+        PrintingProjectInfo info = new PrintingProjectInfo();
+        SyncPrintingProjectBean bean = request.getBean();
+        info.setOrgId(bean.getOrgId());
+        info.setOrgName(bean.getOrgName());
+        info.setExamId(bean.getExamId());
+        info.setExamName(bean.getExamName());
+        printingProjectService.syncPrintingProject(info);
+
+        return new SyncPrintingProjectResp();
     }
 
 }

+ 1 - 1
examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/PrintingProjectInfo.java

@@ -31,7 +31,7 @@ public class PrintingProjectInfo implements JsonSerializable {
      */
     private String examName;
     /**
-     * 机构名称
+     * 学校机构名称
      */
     private String orgName;
     /**