预算编制接口修改

bsoft-api/src/main/java/com/bsoft/api/controller/SerProjValueController.java

@@ -47,4 +47,13 @@ public class SerProjValueController {
         Object result = projValueService.getSummary(request.getDate());
         return Result.success(result);
     }
+
+    @PostMapping("budget/summarynew")
+    @Token
+    @ApiOperation("查询预算编制汇总数据")
+    public Object getSummaryNew(@RequestBody QuerySummary req) throws Throwable {
+        Object result = projValueService.getData(req.getDate(),req.getPage());
+        return Result.success(result);
+    }
+
 }

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageFieldMapper.java

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerPageField;
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface SerPageFieldMapper {
+    int deleteByPrimaryKey(BigDecimal id);
+
+    int insert(SerPageField record);
+
+    SerPageField selectByPrimaryKey(BigDecimal id);
+
+    List<SerPageField> selectAll();
+
+    int updateByPrimaryKey(SerPageField record);
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageProjFieldRsMapper.java

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerPageProjFieldRs;
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface SerPageProjFieldRsMapper {
+    int deleteByPrimaryKey(BigDecimal id);
+
+    int insert(SerPageProjFieldRs record);
+
+    SerPageProjFieldRs selectByPrimaryKey(BigDecimal id);
+
+    List<SerPageProjFieldRs> selectAll();
+
+    int updateByPrimaryKey(SerPageProjFieldRs record);
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageProjMapper.java

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerPageProj;
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface SerPageProjMapper {
+    int deleteByPrimaryKey(BigDecimal id);
+
+    int insert(SerPageProj record);
+
+    SerPageProj selectByPrimaryKey(BigDecimal id);
+
+    List<SerPageProj> selectAll();
+
+    int updateByPrimaryKey(SerPageProj record);
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/mapper/SerPageProjValueMapper.java

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerPageProjValue;
+import com.bsoft.api.model.respmodel.SummaryNew;
+import com.bsoft.api.model.respmodel.SummaryValue;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface SerPageProjValueMapper {
+    int deleteByPrimaryKey(BigDecimal id);
+
+    int insert(SerPageProjValue record);
+
+    SerPageProjValue selectByPrimaryKey(BigDecimal id);
+
+    List<SerPageProjValue> selectAll();
+
+    int updateByPrimaryKey(SerPageProjValue record);
+
+    List<SummaryNew> selectDept(@Param("date") Integer date,@Param("page") Integer page);
+
+    List<SummaryValue> selectValue(@Param("date") Integer date,@Param("page") Integer page,
+                                   @Param("deptCode") String deptCode);
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPageField.java

+package com.bsoft.api.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class SerPageField {
+    private BigDecimal id;
+
+    private Date createDate;
+
+    private BigDecimal createUserid;
+
+    private BigDecimal state;
+
+    private String fieldCode;
+
+    private String fieldName;
+
+    private String remark;
+
+    public BigDecimal getId() {
+        return id;
+    }
+
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getCreateUserid() {
+        return createUserid;
+    }
+
+    public void setCreateUserid(BigDecimal createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    public BigDecimal getState() {
+        return state;
+    }
+
+    public void setState(BigDecimal state) {
+        this.state = state;
+    }
+
+    public String getFieldCode() {
+        return fieldCode;
+    }
+
+    public void setFieldCode(String fieldCode) {
+        this.fieldCode = fieldCode;
+    }
+
+    public String getFieldName() {
+        return fieldName;
+    }
+
+    public void setFieldName(String fieldName) {
+        this.fieldName = fieldName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPageProj.java

+package com.bsoft.api.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class SerPageProj {
+    private BigDecimal id;
+
+    private Date createDate;
+
+    private BigDecimal createUserid;
+
+    private BigDecimal state;
+
+    private String projName;
+
+    private String projCode;
+
+    private String projType;
+
+    public BigDecimal getId() {
+        return id;
+    }
+
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getCreateUserid() {
+        return createUserid;
+    }
+
+    public void setCreateUserid(BigDecimal createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    public BigDecimal getState() {
+        return state;
+    }
+
+    public void setState(BigDecimal state) {
+        this.state = state;
+    }
+
+    public String getProjName() {
+        return projName;
+    }
+
+    public void setProjName(String projName) {
+        this.projName = projName;
+    }
+
+    public String getProjCode() {
+        return projCode;
+    }
+
+    public void setProjCode(String projCode) {
+        this.projCode = projCode;
+    }
+
+    public String getProjType() {
+        return projType;
+    }
+
+    public void setProjType(String projType) {
+        this.projType = projType;
+    }
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPageProjFieldRs.java

+package com.bsoft.api.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class SerPageProjFieldRs {
+    private BigDecimal id;
+
+    private Date createDate;
+
+    private BigDecimal createUserid;
+
+    private BigDecimal state;
+
+    private BigDecimal projType;
+
+    private BigDecimal projId;
+
+    private BigDecimal fieldId;
+
+    private String remark;
+
+    private BigDecimal sort;
+
+    public BigDecimal getId() {
+        return id;
+    }
+
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getCreateUserid() {
+        return createUserid;
+    }
+
+    public void setCreateUserid(BigDecimal createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    public BigDecimal getState() {
+        return state;
+    }
+
+    public void setState(BigDecimal state) {
+        this.state = state;
+    }
+
+    public BigDecimal getProjType() {
+        return projType;
+    }
+
+    public void setProjType(BigDecimal projType) {
+        this.projType = projType;
+    }
+
+    public BigDecimal getProjId() {
+        return projId;
+    }
+
+    public void setProjId(BigDecimal projId) {
+        this.projId = projId;
+    }
+
+    public BigDecimal getFieldId() {
+        return fieldId;
+    }
+
+    public void setFieldId(BigDecimal fieldId) {
+        this.fieldId = fieldId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public BigDecimal getSort() {
+        return sort;
+    }
+
+    public void setSort(BigDecimal sort) {
+        this.sort = sort;
+    }
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerPageProjValue.java

+package com.bsoft.api.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class SerPageProjValue {
+    private BigDecimal id;
+
+    private Date createDate;
+
+    private BigDecimal createUserid;
+
+    private BigDecimal state;
+
+    private String deptCode;
+
+    private BigDecimal dateFilter;
+
+    private String dataCategory;
+
+    private BigDecimal projType;
+
+    private BigDecimal projId;
+
+    private BigDecimal fieldId;
+
+    private String fieldValue;
+
+    private String fieldUnit;
+
+    public BigDecimal getId() {
+        return id;
+    }
+
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getCreateUserid() {
+        return createUserid;
+    }
+
+    public void setCreateUserid(BigDecimal createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    public BigDecimal getState() {
+        return state;
+    }
+
+    public void setState(BigDecimal state) {
+        this.state = state;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public BigDecimal getDateFilter() {
+        return dateFilter;
+    }
+
+    public void setDateFilter(BigDecimal dateFilter) {
+        this.dateFilter = dateFilter;
+    }
+
+    public String getDataCategory() {
+        return dataCategory;
+    }
+
+    public void setDataCategory(String dataCategory) {
+        this.dataCategory = dataCategory;
+    }
+
+    public BigDecimal getProjType() {
+        return projType;
+    }
+
+    public void setProjType(BigDecimal projType) {
+        this.projType = projType;
+    }
+
+    public BigDecimal getProjId() {
+        return projId;
+    }
+
+    public void setProjId(BigDecimal projId) {
+        this.projId = projId;
+    }
+
+    public BigDecimal getFieldId() {
+        return fieldId;
+    }
+
+    public void setFieldId(BigDecimal fieldId) {
+        this.fieldId = fieldId;
+    }
+
+    public String getFieldValue() {
+        return fieldValue;
+    }
+
+    public void setFieldValue(String fieldValue) {
+        this.fieldValue = fieldValue;
+    }
+
+    public String getFieldUnit() {
+        return fieldUnit;
+    }
+
+    public void setFieldUnit(String fieldUnit) {
+        this.fieldUnit = fieldUnit;
+    }
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/QuerySummary.java

 package com.bsoft.api.model.reqmodel;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
 public class QuerySummary {
     @ApiModelProperty(value = "时间", required = true)
     private Integer date;
+    @ApiModelProperty(value = "页面")
+    private Integer page;
 
-    public Integer getDate() {
-        return date;
-    }
-
-    public void setDate(Integer date) {
-        this.date = date;
-    }
 }

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SummaryNew.java

+package com.bsoft.api.model.respmodel;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SummaryNew {
+    private String deptCode;
+    private List<SummaryValue> projTypeList;
+}

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/SummaryValue.java

+package com.bsoft.api.model.respmodel;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SummaryValue {
+    private BigDecimal id;
+
+    private String projName;
+
+    private String fieldName;
+
+    private BigDecimal fieldId;
+
+    private String fieldValue;
+
+    private String fieldUnit;
+}

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java

@@ -3,6 +3,7 @@ package com.bsoft.api.service.Impl;
 import com.bsoft.api.common.enums.ProjectType;
 import com.bsoft.api.common.enums.StateType;
 import com.bsoft.api.common.enums.TypeState;
+import com.bsoft.api.mapper.SerPageProjValueMapper;
 import com.bsoft.api.mapper.SerProjMapper;
 import com.bsoft.api.mapper.SerProjValueMapper;
 import com.bsoft.api.model.SerProjValue;
@@ -26,6 +27,8 @@ public class SerProjValueServiceImpl implements SerProjValueService {
     private SerProjMapper serProjMapper;
     @Resource
     private SerProjValueMapper serProjValueMapper;
+    @Resource
+    private SerPageProjValueMapper pageProjValueMapper;
 
     //查询项目数值
     @Override
@@ -102,5 +105,16 @@ public class SerProjValueServiceImpl implements SerProjValueService {
         return result;
     }
 
+    @Override
+    public Object getData(Integer date,Integer page) {
+        List<SummaryNew> result = pageProjValueMapper.selectDept(date,page);
+        if(result != null && result.size() > 0){
+            for(SummaryNew summary : result){
+                List<SummaryValue> values = pageProjValueMapper.selectValue(date,page,summary.getDeptCode());
+                summary.setProjTypeList(values);
+            }
+        }
+        return result;
+    }
 
 }

bsoft-api/src/main/java/com/bsoft/api/service/SerProjValueService.java

@@ -8,4 +8,6 @@ public interface SerProjValueService {
     boolean save(AddBudgetValue request);
 
     Object getSummary(Integer date);
+
+    Object getData(Integer date,Integer page);
 }

bsoft-api/src/main/resources/application-test.properties

@@ -5,7 +5,7 @@ jdbc.password=123456
 jdbc.driverClass=com.mysql.jdbc.Driver
 
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.username=scml_hc
+spring.datasource.username=scml_pd
 spring.datasource.password=123
 spring.datasource.url=jdbc:oracle:thin:@192.168.18.171:1521:his
 

bsoft-api/src/test/resources/generatorConfig.xml

@@ -42,8 +42,17 @@
         <!-- 生成映射接口配置 -->
         <javaClientGenerator targetPackage="com.bsoft.api.mapper" targetProject="src/main/java" type="XMLMAPPER"/>
 
-        <table tableName="SER_PROJ_VALUE">
-            <generatedKey column="id" sqlStatement="select SEQ_SER_PROJ_VALUE_ID.nextval from dual" identity="true"/>
+        <table tableName="SER_PAGE_FIELD">
+            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_FIELD_ID.nextval from dual" identity="true"/>
+        </table>
+        <table tableName="SER_PAGE_PROJ">
+            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_PROJ_ID.nextval from dual" identity="true"/>
+        </table>
+        <table tableName="SER_PAGE_PROJ_FIELD_RS">
+            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_PROJ_FIELD_RS_ID.nextval from dual" identity="true"/>
+        </table>
+        <table tableName="SER_PAGE_PROJ_VALUE">
+            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_PROJ_VALUE_ID.nextval from dual" identity="true"/>
         </table>
     </context>