Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 0a11a033 fc20d76f
Showing 3 changed files with 24 additions and 7 deletions
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/resources/static/pages/oil/jyszList.html
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
@@ -35,7 +36,16 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		t.setNbbm(t.getNbbm().trim().toUpperCase());
 		Line line=BasicData.nbbm2LineMap.get(t.getNbbm());
 		t.setLine(line == null?"" : line.getLineCode());
-		return service.save(t);
+		Map<String, Object> map = new HashMap<>();
+		try {
+		 map=service.save(t);
+		}catch (Exception e) {
+			// TODO: handle exception
+			if(e.getMessage().indexOf("PK_CWJYUK")>0){
+				map.put("fage", "存在相同数据,数据已经过滤");
+			}
+		}
+		return map;
 	}
 	@RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
@@ -393,5 +393,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		return cs;
 	}
+	
+	
 }
@@ -115,7 +115,8 @@
 	<td>{{obj.xgr}}</td>
 	<td>{{obj.createDate}}</td>
 	<td>
-		<!--<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+		<button type="button" class="btn btn-sm blue btn-jyszList" 
+			data-id="{{obj.id}}">删除</button>
 	</td>
 </tr>
 {{/each}}
@@ -241,9 +242,7 @@ $(function(){
 			$.each(data.content, function(i, obj) {
                 obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
             });
-			console.log(data.content);
 			var bodyHtm = template('jysz_list_temp', {list: data.content});
-			
 			$('#datatable_jysz tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
@@ -252,6 +251,7 @@ $(function(){
 				initPagination = true;
 				showPagination(data);
 			}
+			$('.btn-jyszList').on('click', remJysz);
 			layer.close(i);
 		});
 	}
@@ -302,9 +302,14 @@ $(function(){
 		    }
 		});
 	}
-	
-	
 	//删除
+	function remJysz(){
+		var id = $(this).data('id');
+		removeConfirm('确定要删除选中的数据？', '/cwjy/' + id ,function(){
+			$('tr.filter .filter-submit').click();
+		});
+	}
+	/* 
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
 			return;
@@ -314,7 +319,7 @@ $(function(){
 		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
 			$('tr.filter .filter-submit').click();
 		});
-	});
+	}); */
 	$('#addJysz').on('click', function(){