添加 安检删除功能

@@ -13,6 +13,7 @@ import com.agent.vo.agent.SecurityDeclarationVo;
 import com.agent.xml.XmlBuildTask;
 import com.framework.core.Servlets;
 import com.framework.mail.MailSenderService;
+import com.framework.shiro.SessionUtil;
 import com.framework.util.MessageKit;
 import com.framework.util.MessageType;
 import com.framework.util.StringUtils;
@@ -23,6 +24,7 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import tools.Tools;
@@ -512,6 +514,28 @@ public class SecurityDeclarationController {
         return "declaration/edit";
     }
 
+
+    @RequestMapping(value = "/doDelete")
+    @ResponseBody
+    public ResponseModel doDelete(Long id){
+
+        ResponseModel model = new ResponseModel();
+
+        UserEntity user = SessionUtil.getUser();
+        if (user.getId() == 1){
+
+            if (securityDeclarationService.sdDelete(id)>0){
+
+                model.setStatus(200);
+            }
+
+            return model;
+        }else {
+            model.setStatus(201);
+            return model;
+        }
+    }
+
     /**
      * 安检申报修改
      * @param request

@@ -25,4 +25,10 @@ public interface SDCargoTypeRepository extends PagingAndSortingRepository<SDCarg
     @Query(value = "delete from SD_CARGO_TYPE where id=?1", nativeQuery = true)
     int deleteAlls(Long waybill);
 
+    @Transactional
+    @Modifying
+    @Query(value = "delete from SD_CARGO_TYPE where sd_waybill=?1", nativeQuery = true)
+    int typeDelete(String waybill);
+
+
 }

@@ -10,6 +10,7 @@ import javax.annotation.Resource;
 import com.agent.entity.agent.*;
 import com.agent.repository.system.HzWaybillRepository;
 import com.agent.repository.system.SDCargoNameRepository;
+import com.agent.repository.system.SDCargoTypeRepository;
 import com.agent.repository.system.SecurityDeclarationRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -132,6 +133,9 @@ public class ManifestService extends BasicService<ManifestEntity> {
 	@Resource
 	private SDCargoNameRepository sdCargoNameRepository;
 
+	@Resource
+	private SDCargoTypeRepository sdCargoTypeRepository;
+
 	/**
 	 * 分页查询
 	 *
@@ -228,6 +232,8 @@ public class ManifestService extends BasicService<ManifestEntity> {
 
 				sdCargoNameRepository.deletes(waybillnomaster);
 
+                sdCargoTypeRepository.typeDelete(waybillnomaster);
+
 			}
 		}catch (Exception e){
 			e.printStackTrace();

@@ -3,6 +3,8 @@ package com.agent.service.system;
 import com.agent.entity.Constant;
 import com.agent.entity.agent.SecurityDeclarationEntity;
 import com.agent.entity.agent.SecurityManifestEntity;
+import com.agent.repository.system.SDCargoNameRepository;
+import com.agent.repository.system.SDCargoTypeRepository;
 import com.agent.repository.system.SecurityDeclarationRepository;
 import com.agent.repository.system.SecurityManifestRepository;
 import com.agent.service.BasicService;
@@ -33,6 +35,12 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt
     @Autowired
     private SecurityManifestRepository securityManifestRepository;
 
+    @Autowired
+    private SDCargoTypeRepository sdCargoTypeRepository;
+
+    @Autowired
+    private SDCargoNameRepository sdCargoNameRepository;
+
     /**
      * 分页查询
      *
@@ -141,4 +149,26 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt
         return body;
     }
 
+    /**
+     * 安检删除
+     */
+    public int sdDelete(Long id){
+
+        try {
+            SecurityDeclarationEntity one = securityDeclarationRepository.findOne(id);
+
+            securityDeclarationRepository.delete(id);
+
+            sdCargoNameRepository.deletes(one.getSd_waybill());
+
+            sdCargoTypeRepository.typeDelete(one.getSd_waybill());
+
+            return 1;
+
+        }catch (Exception e){
+            return 0;
+        }
+
+    }
+
 }

@@ -58,6 +58,7 @@
                      海关关区:<input id="manifnum" type="text" name="search_EQ_customs" style="width:166px;height:35px;line-height:35px;">
                      <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
                      <a href="javascript:doSaves()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add">添加</a>
+
                      <%--<a href="javascript:printAll()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red">批量打印</a>--%>
                    </table>
 	          	</form>
@@ -107,7 +108,8 @@
 
     function operatorFormat(val, row, index) {
         var html = "<a href='javascript:void(0)' onclick='print("+row.id+")' style='text-decoration:none;color:blue;'>打印</a>" +
-            "&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:void(0)' onclick='findOne("+row.id+")' style='text-decoration:none;color:blue;'>查看</a>";
+            "&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:void(0)' onclick='findOne("+row.id+")' style='text-decoration:none;color:blue;'>查看</a>"+
+            "&nbsp;&nbsp;&nbsp;&nbsp;<a href='javascript:void(0)' onclick='doDelete("+row.id+")' style='text-decoration:none;color:blue;'>删除</a>";
 
         return html;
     }
@@ -223,7 +225,17 @@
 		}
 
 
-
+        function doDelete(id) {
+            $.post("<%=basePath %>declaration/doDelete",{id:id},function(data){
+                if(data.status == 200) {
+                    layer.confirm("<spring:message code="opt.delsuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        window.location.href="<%=basePath %>declaration/list";
+                    })
+                }else{
+                    layer.open({content:"请联系管理员删除"});
+                }
+            },"json");
+        }
 		
 		function editRow(id){
             layer.open({
@@ -307,6 +319,9 @@
             <%--}--%>
         <%--},"json");--%>
     }
+
+
+
 </script>
 </body>
 </html>