Merge branch 'develop_migration' into 'develop_master'

Develop migration See merge request LiuChao/foton-slrs-system-rest!538
2022-06-24 13:50:47 +08:00
parent 340615ad26 8d51647019
commit 996d2b4cfb
8 changed files with 189 additions and 2 deletions
@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarBussionessStandState.controller;
 import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
 import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService;
 import com.adc.da.util.LoginUserUtil;
@@ -12,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import io.swagger.annotations.Api;
@@ -36,6 +38,17 @@ public class SarBussionessStandStateController extends BaseController<SarBussion
    @Autowired
    private ISarBussionessStandStateService bussionessStandStateService;

+    /**
+     * 查询当天企标复审列表
+     * @param page  标准信息
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandState|查询当天企标复审")
+    @PostMapping("/getSarBussionessStandStateProcessList")
+    public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
+        return bussionessStandStateService.getSarBussionessStandStateProcessList(page);
+    }
+
    /**
     * 自定义分页复审流程查询列表
     * @param page  标准信息
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarBussionessStandState.dao;

+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,8 @@ import java.util.List;
 */
 public interface SarBussionessStandStateDao extends BaseMapper<SarBussionessStandState> {

+    List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
+
    List<SarBussionessStandState> getBussionessStandStatePage(SarBussionessStandStatePage page);

    int getBussionessStandStateCount(SarBussionessStandStatePage page);
@@ -0,0 +1,45 @@
+/**
+  * Copyright 2022 bejson.com 
+  */
+package com.adc.da.slrs.sarBussionessStandState.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Auto-generated: 2022-06-23 15:31:2
+ *
+ * @author bejson.com (i@bejson.com)
+ * @website http://www.bejson.com/java2pojo/
+ */
+@Data
+public class ModelData {
+
+    private String id;
+    private String standId;
+    private String standName;
+    private String standCode;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String reviewTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+    private String reviewResults;
+    private String reviewProcessNum;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String creationTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String modifyTime;
+    private int validFlag;
+    private String param1;
+    private String param2;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTime;
+    private String standSort;
+    private String qcdw;
+    private String fsrqbuss;
+    private String qcrbuss;
+    private String processStatus;
+    private String bussFsSubUser1;
+    private String bussFsSubUser1Name;
+}
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarBussionessStandState.service;

+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +17,8 @@ import java.util.List;
 */
 public interface ISarBussionessStandStateService extends IService<SarBussionessStandState> {

+    List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page);
+
    List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception;

    List<SarBussionessStandState> getSarBussionessStandStatePage(SarBussionessStandStatePage page) throws Exception;
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarBussionessStandState.service.impl;

+import com.adc.da.slrs.sarBussionessStandState.entity.ModelData;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
 import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao;
 import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage;
@@ -20,6 +21,12 @@ import java.util.List;
@Service
 public class SarBussionessStandStateServiceImpl extends ServiceImpl<SarBussionessStandStateDao, SarBussionessStandState> implements ISarBussionessStandStateService {

+    @Override
+    public List<ModelData> getSarBussionessStandStateProcessList(SarBussionessStandStatePage page){
+        List<ModelData> stateList = this.baseMapper.getSarBussionessStandStateProcessList(page);
+        return stateList;
+    }
+
    @Override
    public List<SarBussionessStandState> getSarBussionessStandStatePageNo(SarBussionessStandStatePage page) throws Exception{
        Integer rowCount = this.baseMapper.getBussionessStandStateCountNo(page);