xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
master
xiezuo003 2 years ago
parent dc7abfd9d1
commit 997f7e11d6
4 changed files with 95 additions and 7 deletions
Show Stats Download Patch File Download Diff File

1
.idea/encodings.xml
Unescape View File

@ -3,5 +3,6 @@
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/target/generated-sources" charset="UTF-8" />
</component>
</project>

64
.idea/workspace.xml
Unescape View File

@ -4,8 +4,15 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong" />
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong">
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gj_erp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gj_erp.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
<list id="fe06e205-ba59-4998-bbc5-8fab0fa434d9" name="Revert &quot;TEST&quot;" comment="Revert &quot;TEST&quot;1" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -116,7 +123,9 @@
<workItem from="1695350682722" duration="55000" />
<workItem from="1695350762453" duration="153000" />
<workItem from="1695350942245" duration="58000" />
<workItem from="1695351043840" duration="296000" />
<workItem from="1695351043840" duration="2412000" />
<workItem from="1695353513521" duration="2941000" />
<workItem from="1695383415111" duration="2165000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>
@ -146,7 +155,49 @@
<option name="project" value="LOCAL" />
<updated>1695349889153</updated>
</task>
<option name="localTasksCounter" value="5" />
<task id="LOCAL-00005" summary="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b">
<created>1695351369017</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1695351369017</updated>
</task>
<task id="LOCAL-00006" summary="TEST">
<created>1695351518242</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1695351518242</updated>
</task>
<task id="LOCAL-00007" summary="wanghaodong">
<created>1695351530796</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1695351530796</updated>
</task>
<task id="LOCAL-00008" summary="Revert &quot;TEST&quot;1">
<created>1695351777436</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1695351777436</updated>
</task>
<task id="LOCAL-00009" summary="Revert &quot;finish&quot;&#10;&#10;test">
<created>1695353073646</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1695353073646</updated>
</task>
<task id="LOCAL-00010" summary="111&#10;&#10;This reverts commit f64a4dcb">
<created>1695353309158</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1695353309158</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -167,8 +218,13 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="finish" />
<MESSAGE value="Revert &quot;finish&quot;" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
<MESSAGE value="wanghaodong" />
<option name="LAST_COMMIT_MESSAGE" value="wanghaodong" />
<MESSAGE value="TEST" />
<MESSAGE value="Revert &quot;TEST&quot;1" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
<MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
<option name="LAST_COMMIT_MESSAGE" value="111&#10;&#10;This reverts commit f64a4dcb" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

6
gj_erp.iml
Unescape View File

@ -4,6 +4,11 @@
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
<root url="file://$MODULE_DIR$/target/generated-sources" />
</sourceRoots>
</configuration>
</facet>
<facet type="jpa" name="JPA">
@ -26,6 +31,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources" isTestSource="false" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />

31
src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
Unescape View File

@ -2,6 +2,7 @@ package com.dsic.gj_erp.bean.jhgk;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@ -30,65 +31,89 @@ public class DmXbjh implements Serializable {
private static final long serialVersionUID=1L;
@ExcelProperty("学生编号")
// @ExcelProperty("学生编号")
@ApiModelProperty(value = "状态； 0未提交1已提交；默认为0；")
private String zt;
@ExcelProperty("学生编号")
// @ExcelProperty("学生编号")
@ApiModelProperty(value = "2023年01月的 产量，后面字段以此类推")
@TableField("cl_202301")
private Double cl202301;
@ExcelProperty("学生编号")
@TableField("cl_202405")
private Double cl202405;
@TableField("cl_202411")
private Double cl202411;
@TableField("cl_202303")
private Double cl202303;
@TableField("cl_202408")
private Double cl202408;
@TableField("cl_202402")
private Double cl202402;
@TableField("cl_202306")
private Double cl202306;
@TableField("cl_202407")
private Double cl202407;
@TableField("cl_202501")
private Double cl202501;
@Id
@TableId(value = "dc_ch", type = IdType.ASSIGN_UUID)
private String dcCh;
@TableField("cl_202311")
private Double cl202311;
@TableField("cl_202305")
private Double cl202305;
@TableField("cl_202410")
private Double cl202410;
@TableField("cl_202308")
private Double cl202308;
@TableField("cl_202302")
private Double cl202302;
@TableField("cl_202307")
private Double cl202307;
@TableField("cl_202401")
private Double cl202401;
@TableField("cl_202404")
private Double cl202404;
@TableField("cl_202412")
private Double cl202412;
@TableField("cl_202310")
private Double cl202310;
@TableField("cl_202304")
private Double cl202304;
@TableField("cl_202409")
private Double cl202409;
@TableField("cl_202403")
private Double cl202403;
@TableField("cl_202309")
private Double cl202309;
@TableField("cl_202406")
private Double cl202406;
@TableField("cl_202312")
private Double cl202312;

Write Preview
Loading…
Cancel
Save