孙向锦 / SunvoteEducation

Commit 8ebabb041153092382811171ff9afb7a7b640a0b

Authored by jack
2 parents 41772c65 132ababb

Merge branch '标准版' of http://120.78.57.84/Elvis/SunvoteEducation into 标准版

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
src/com/fh/controller/api/V1.java
  View file @8ebabb0
@@ -1764,7 +1764,7 @@ public class V1 extends BaseController { @@ -1764,7 +1764,7 @@ public class V1 extends BaseController {
1764 @RequestMapping(value = "/uploadstudenttest", produces = "application/json;charset=UTF-8") 1764 @RequestMapping(value = "/uploadstudenttest", produces = "application/json;charset=UTF-8")
1765 @ResponseBody 1765 @ResponseBody
1766 public Object uploadstudenttest() { 1766 public Object uploadstudenttest() {
1767 - event("uploadupdateTestpaper"); 1767 + event("uploadstudenttest");
1768 long cur = System.currentTimeMillis(); 1768 long cur = System.currentTimeMillis();
1769 PageData pd = this.getPageData(); 1769 PageData pd = this.getPageData();
1770 ResponseGson<String> res = new ResponseGson(); 1770 ResponseGson<String> res = new ResponseGson();
@@ -1789,7 +1789,7 @@ public class V1 extends BaseController { @@ -1789,7 +1789,7 @@ public class V1 extends BaseController {
1789 testPd.put("START_DATE", ""); 1789 testPd.put("START_DATE", "");
1790 testPd.put("END_DATE", studentPaper.getEndDate()); 1790 testPd.put("END_DATE", studentPaper.getEndDate());
1791 testPd.put("NAME", ""); 1791 testPd.put("NAME", "");
1792 - testPd.put("TESTPAPER_ID", get32UUID()); 1792 + testPd.put("TESTPAPER_ID", studentPaper.getPaperId());
1793 testPd.put("OTHER_SCORE", ""); 1793 testPd.put("OTHER_SCORE", "");
1794 testPd.put("HIGHT_SCORE", ""); 1794 testPd.put("HIGHT_SCORE", "");
1795 testPd.put("LOW_SCORE", ""); 1795 testPd.put("LOW_SCORE", "");
@@ -1835,14 +1835,14 @@ public class V1 extends BaseController { @@ -1835,14 +1835,14 @@ public class V1 extends BaseController {
1835 stestPd.put("PAPER_ID", studentPaper.getPaperId()); 1835 stestPd.put("PAPER_ID", studentPaper.getPaperId());
1836 stestPd.put("TEST_ID", studentPaper.getPaperId()); 1836 stestPd.put("TEST_ID", studentPaper.getPaperId());
1837 stestPd.put("SCORE", studentAnswer.getScore()); 1837 stestPd.put("SCORE", studentAnswer.getScore());
1838 - testPd.put("LOST_TEST", studentAnswer.getLosttest()); 1838 + stestPd.put("LOST_TEST", studentAnswer.getLosttest());
1839 List<PageData> liste = studenttestService.listAll(stestPd); 1839 List<PageData> liste = studenttestService.listAll(stestPd);
1840 if (liste == null || liste.size() == 0) { 1840 if (liste == null || liste.size() == 0) {
1841 - testPd.put("STUDENTTEST_ID", get32UUID()); 1841 + stestPd.put("STUDENTTEST_ID", get32UUID());
1842 studenttestService.save(stestPd); 1842 studenttestService.save(stestPd);
1843 } else { 1843 } else {
1844 PageData ptd = liste.get(0); 1844 PageData ptd = liste.get(0);
1845 - testPd.put("STUDENTTEST_ID", ptd.get("STUDENTTEST_ID")); 1845 + stestPd.put("STUDENTTEST_ID", ptd.get("STUDENTTEST_ID"));
1846 studenttestService.edit(stestPd); 1846 studenttestService.edit(stestPd);
1847 } 1847 }
1848 1848
@@ -1886,7 +1886,7 @@ public class V1 extends BaseController { @@ -1886,7 +1886,7 @@ public class V1 extends BaseController {
1886 } else { 1886 } else {
1887 res.setDataError(); 1887 res.setDataError();
1888 } 1888 }
1889 - logger.info("uploadupdatetestpaper cost time:" 1889 + logger.info("uploadstudenttest cost time:"
1890 + (System.currentTimeMillis() - cur)); 1890 + (System.currentTimeMillis() - cur));
1891 1891
1892 return res.toJson(); 1892 return res.toJson();