Merge remote-tracking branch 'remotes/origin/zgl'

# Conflicts:
#	.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml
#	src/dao/DBManagement.java
hechu1
zhai_lw 6 years ago
parent e9927b49f5
commit ad7086f650

@ -0,0 +1,16 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="gdms:Web exploded">
<output-path>$PROJECT_DIR$/out/artifacts/gdms_Web_exploded</output-path>
<root id="root">
<element id="javaee-facet-resources" facet="gdms/web/Web" />
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="gdms" />
</element>
<element id="directory" name="lib">
<element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar" />
</element>
</element>
</root>
</artifact>
</component>

File diff suppressed because it is too large Load Diff

@ -35,8 +35,8 @@ public class ProcessManagement {
Map<String,String> userTables = DBManagement.getUserStatusTables(user.getType());
String graduationDesignId = null;
for(Map.Entry<String,String> entry:userTables.entrySet()){
String[] ti = entry.getKey().split(".");
String[] ts = entry.getValue().split(".");
String[] ti = entry.getKey().split("\\.");
String[] ts = entry.getValue().split("\\.");
List<String> ls = new ArrayList<>();
ls.add("id");
Map<String,String> limits = new HashMap<>();

@ -70,11 +70,17 @@ public interface AccountManagement {
}
String defaultStatus = "1";
static void initAllStatus(String id) throws GExcptSQL {
for(Map.Entry<String,String> entry:DBManagement.allStatus.entrySet()){
for(String table:DBManagement.graduationDesignTables){
Map<String,String> vMap = new HashMap<>();
vMap.put("id",id);
DBManagement.insert(table,vMap);
}
for(Map.Entry<String,String> entry:DBManagement.allStatus.entrySet()){
Map<String,String> vMap = new HashMap<>();
Map<String,String> limits = new HashMap<>();
limits.put("id",id);
vMap.put(entry.getValue(),defaultStatus);
DBManagement.insert(entry.getKey(),vMap);
DBManagement.update(entry.getKey(),vMap,limits);
}
}
}

Loading…
Cancel
Save