Commit 015d5970b7867ba10f63a2a21102fd56af9d31ea

Authored by 孙向锦
1 parent ce7dae99

更新删除接口

resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -162,6 +162,7 @@ @@ -162,6 +162,7 @@
162 LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID 162 LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
163 WHERE 163 WHERE
164 sv_coursemanagement.TEACHER_ID = #{TEACHER_ID} 164 sv_coursemanagement.TEACHER_ID = #{TEACHER_ID}
  165 + order by sv_sclass.CLASS_CODE
165 166
166 </select> 167 </select>
167 168
resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -123,6 +123,27 @@ @@ -123,6 +123,27 @@
123 HOMEWORK_ID = #{HOMEWORK_ID} 123 HOMEWORK_ID = #{HOMEWORK_ID}
124 </update> 124 </update>
125 125
  126 +
  127 + <!-- 修改 -->
  128 + <update id="deleteHomework" parameterType="pd">
  129 + update
  130 + <include refid="tableName"></include>
  131 + set IS_DELETE = '1'
  132 + where
  133 + HOMEWORK_ID = #{HOMEWORK_ID}
  134 + </update>
  135 + <!-- 修改 -->
  136 + <update id="deleteHomeworkAll" parameterType="String">
  137 + update
  138 + <include refid="tableName"></include>
  139 + set IS_DELETE = '1'
  140 + where
  141 + HOMEWORK_ID in
  142 + <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
  143 + #{item}
  144 + </foreach>
  145 + </update>
  146 +
126 <!-- 通过ID获取数据 --> 147 <!-- 通过ID获取数据 -->
127 <select id="findById" parameterType="pd" resultType="pd"> 148 <select id="findById" parameterType="pd" resultType="pd">
128 select 149 select
@@ -174,6 +195,8 @@ @@ -174,6 +195,8 @@
174 <if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 --> 195 <if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 -->
175 and COMPLETE_DATE &lt; #{pd.ENDDATE} 196 and COMPLETE_DATE &lt; #{pd.ENDDATE}
176 </if> 197 </if>
  198 +
  199 + and IS_DELETE != '1'
177 </select> 200 </select>
178 201
179 <!-- 列表(全部) --> 202 <!-- 列表(全部) -->
@@ -202,18 +225,21 @@ @@ -202,18 +225,21 @@
202 and COMPLETE_DATE &gt; #{COMPLETE_DATE} 225 and COMPLETE_DATE &gt; #{COMPLETE_DATE}
203 </if> 226 </if>
204 227
  228 + and IS_DELETE != '1'
205 229
206 </select> 230 </select>
207 231
208 <!-- 列表(全部) --> 232 <!-- 列表(全部) -->
209 <select id="qlistAll" parameterType="pd" resultType="pd"> 233 <select id="qlistAll" parameterType="pd" resultType="pd">
210 select 234 select
  235 + COMPLETE_COUNT,
211 CODE, 236 CODE,
212 NAME, 237 NAME,
213 SUBJECT_ID, 238 SUBJECT_ID,
214 CLASS_ID, 239 CLASS_ID,
215 COMPLETE_DATE, 240 COMPLETE_DATE,
216 ALL_SCORE, 241 ALL_SCORE,
  242 + QUESTION_COUNT,
217 HOMEWORK_ID 243 HOMEWORK_ID
218 from 244 from
219 <include refid="tableName"></include> 245 <include refid="tableName"></include>
@@ -237,7 +263,7 @@ @@ -237,7 +263,7 @@
237 and COMPLETE_DATE &gt; #{COMPLETE_DATE} 263 and COMPLETE_DATE &gt; #{COMPLETE_DATE}
238 </if> 264 </if>
239 265
240 - 266 + and IS_DELETE != '1'
241 </select> 267 </select>
242 268
243 <!-- 批量删除 --> 269 <!-- 批量删除 -->
resources/mybatis1/sunvote/HomeworkProblemMapper.xml
@@ -137,6 +137,7 @@ @@ -137,6 +137,7 @@
137 <!-- 列表(全部) --> 137 <!-- 列表(全部) -->
138 <select id="listProblem" parameterType="pd" resultType="pd"> 138 <select id="listProblem" parameterType="pd" resultType="pd">
139 select 139 select
  140 + HOMEWORKPROBLEM_ID,
140 RANK, 141 RANK,
141 NAME, 142 NAME,
142 OPTION_NUM, 143 OPTION_NUM,
src/com/fh/controller/api/V1.java
@@ -261,10 +261,18 @@ public class V1 extends BaseController { @@ -261,10 +261,18 @@ public class V1 extends BaseController {
261 res.setData(pageData); 261 res.setData(pageData);
262 // 填充数据到返回数据中 262 // 填充数据到返回数据中
263 } else if(headerMaster != null && headerMaster.get("HEADMASTER_ID") != null){ 263 } else if(headerMaster != null && headerMaster.get("HEADMASTER_ID") != null){
264 - headerMaster.put("PASSWORD", "");  
265 headerMaster.put("role", "headermaster"); 264 headerMaster.put("role", "headermaster");
266 List<PageData> classInfoList = sclassService.listAll(headerMaster); 265 List<PageData> classInfoList = sclassService.listAll(headerMaster);
  266 + for(PageData pttd : classInfoList){
  267 + pttd.put("CLASS_ID", pttd.get("ID"));
  268 + pttd.remove("ID");
  269 + pttd.remove("HEADMASTER_ID");
  270 + pttd.remove("SCHOOL_ID");
  271 + pttd.remove("CLASS_TYPE");
  272 + }
267 headerMaster.put("classInfoList", classInfoList); 273 headerMaster.put("classInfoList", classInfoList);
  274 + headerMaster.remove("USERNAME");
  275 + headerMaster.remove("PASSWORD");
268 res.setData(headerMaster); 276 res.setData(headerMaster);
269 277
270 }else{ 278 }else{
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -242,7 +242,7 @@ public class HomeworkController extends BaseController { @@ -242,7 +242,7 @@ public class HomeworkController extends BaseController {
242 String DATA_IDS = pd.getString("DATA_IDS"); 242 String DATA_IDS = pd.getString("DATA_IDS");
243 if (null != DATA_IDS && !"".equals(DATA_IDS)) { 243 if (null != DATA_IDS && !"".equals(DATA_IDS)) {
244 String ArrayDATA_IDS[] = DATA_IDS.split(","); 244 String ArrayDATA_IDS[] = DATA_IDS.split(",");
245 - homeworkService.deleteAll(ArrayDATA_IDS); 245 + homeworkService.deleteHomeworkAll(ArrayDATA_IDS);
246 pd.put("msg", "ok"); 246 pd.put("msg", "ok");
247 } else { 247 } else {
248 pd.put("msg", "no"); 248 pd.put("msg", "no");
src/com/fh/controller/sunvote/report/ReportController.java
@@ -70,20 +70,6 @@ public class ReportController extends BaseController { @@ -70,20 +70,6 @@ public class ReportController extends BaseController {
70 tpd.put("ID", getUserID()); 70 tpd.put("ID", getUserID());
71 PageData adminInfos = v1Service.getAdminInfo(tpd); 71 PageData adminInfos = v1Service.getAdminInfo(tpd);
72 List<PageData> subjectInfos = new ArrayList<PageData>(); 72 List<PageData> subjectInfos = new ArrayList<PageData>();
73 -// for(PageData pad : adminInfos){  
74 -// PageData tmpd = new PageData();  
75 -// Object gradeId = pad.get("GRADE_ID");  
76 -// tmpd.put("SNAME", pad.get("SNAME"));// 学校名称  
77 -// tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID  
78 -// tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id  
79 -// tmpd.put("GNAME", pad.get("GNAME"));//年级名称  
80 -// tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id  
81 -// tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称  
82 -// if(gradeId != null && !"".equals(gradeId)){  
83 -// }else{  
84 -// subjectInfos.add(tmpd);  
85 -// }  
86 -// }  
87 mv.addObject("subjectInfos", subjectInfos); 73 mv.addObject("subjectInfos", subjectInfos);
88 }else{ 74 }else{
89 pd.put("TEACHER_ID", getUserID()); 75 pd.put("TEACHER_ID", getUserID());
src/com/fh/service/sunvote/homework/HomeworkManager.java
@@ -29,6 +29,16 @@ public interface HomeworkManager{ @@ -29,6 +29,16 @@ public interface HomeworkManager{
29 * @throws Exception 29 * @throws Exception
30 */ 30 */
31 public void edit(PageData pd)throws Exception; 31 public void edit(PageData pd)throws Exception;
  32 + /**修改
  33 + * @param pd
  34 + * @throws Exception
  35 + */
  36 + public void deleteHomework(PageData pd)throws Exception;
  37 + /**修改
  38 + * @param pd
  39 + * @throws Exception
  40 + */
  41 + public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception;
32 42
33 /**列表 43 /**列表
34 * @param page 44 * @param page
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
@@ -47,6 +47,22 @@ public class HomeworkService implements HomeworkManager{ @@ -47,6 +47,22 @@ public class HomeworkService implements HomeworkManager{
47 dao.update("HomeworkMapper.edit", pd); 47 dao.update("HomeworkMapper.edit", pd);
48 } 48 }
49 49
  50 + /**修改
  51 + * @param pd
  52 + * @throws Exception
  53 + */
  54 + public void deleteHomework(PageData pd)throws Exception{
  55 + dao.update("HomeworkMapper.deleteHomework", pd);
  56 + }
  57 +
  58 + /**修改
  59 + * @param pd
  60 + * @throws Exception
  61 + */
  62 + public void deleteHomeworkAll(String[] ArrayDATA_IDS)throws Exception{
  63 + dao.update("HomeworkMapper.deleteHomework", ArrayDATA_IDS);
  64 + }
  65 +
50 /**列表 66 /**列表
51 * @param page 67 * @param page
52 * @throws Exception 68 * @throws Exception