温红权 hace 7 años
padre
commit
8ccafa2eef

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/CheckItemController.java

@@ -69,7 +69,7 @@ public class CheckItemController extends BaseController {
      */
     @RequestMapping(value = "/delete")
     public String delete(@RequestBody CheckItem checkItem){
-    	checkItemService.delete(checkItem.getId());
+    	checkItemService.delete(checkItem);
         CacheUtil.refreshItemMap(itemService);
         CacheUtil.refreshItemNameMap(itemService);
     	return super.returnSuccessResult("删除成功");

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/CheckItemDao.java

@@ -18,6 +18,6 @@ public interface CheckItemDao  {
     public CheckItem getOne(Long id);
     public void insert(CheckItem checkItem);
     public void update(CheckItem checkItem);
-    public void delete(Long id);
+    public void delete(CheckItem checkItem);
     public List<CheckItem> getCheckItemByRuleType(Map<String,String> param);
 }

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/CheckRuleItemDao.java

@@ -12,7 +12,7 @@ import com.xintong.visualinspection.bean.CheckItem;
 public interface CheckRuleItemDao  {
     public void insert(CheckItem checkItem);
    
-    public void delete(CheckItem checkItem);
+    public void delete(Long checkItemid);
     
     public Integer selectItemCount(CheckItem checkItem);
    

+ 2 - 6
VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckItemMapper.xml

@@ -50,13 +50,9 @@
         id = #{id}
     </update>
 
-    <delete id="delete" parameterType="java.lang.Long" >
---         DELETE FROM
---         check_item
---         WHERE
---         id =#{id}
+    <update id="delete" parameterType="com.xintong.visualinspection.bean.CheckItem" >
       update check_item SET status = -1 where id =#{id}
-    </delete>
+    </update>
     
     <select id="getCheckItemByRuleType" parameterType="map" resultMap="BaseResultMap"  >
         SELECT *

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/CheckItemService.java

@@ -24,6 +24,6 @@ public interface CheckItemService {
     public List<CheckItem> getByRuleId(Long id);
     public void insert(CheckItem checkItem);
     public void update(CheckItem checkItem);
-    public void delete(Long id);
+    public void delete(CheckItem checkItem);
     public List<CheckItem> getCheckItemByRuleType(Map<String,String> param);
 }

+ 7 - 2
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckItemServiceImpl.java

@@ -97,9 +97,14 @@ public class CheckItemServiceImpl extends BaseService implements CheckItemServic
 
 
 	@Override
-	public void delete(Long id) {
+	public void delete(CheckItem checkItem) {
 		// TODO Auto-generated method stub
-		checkItemDao.delete(id);
+        try{
+            checkItemDao.delete(checkItem);
+        }catch (Exception e){
+            System.out.println(e.getStackTrace());
+        }
+
 	}
 
 

+ 1 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckRuleItemServiceImpl.java

@@ -29,7 +29,7 @@ public class CheckRuleItemServiceImpl extends BaseService implements CheckRuleIt
 	@Override
 	public void delete(CheckItem checkItem) {
 		// TODO Auto-generated method stub
-		checkRuleItemDao.delete(checkItem);
+		checkRuleItemDao.delete(checkItem.getId());
 		
 	}