1.3版本修改，增加删除功能

yzg-util-base/src/test/java/helper/DataDaoVoTest.java

@@ -39,18 +39,19 @@ public class DataDaoVoTest {
     @Test
     public void testEn() {
         int id = 1;
+        Temp last = new Temp(id++, "产品3", "类型3", 4, 0);
         List<Temp> his = Arrays.asList(
-                new Temp(id++,"产品1","类型1",1,0),
-                new Temp(id++,"产品1","类型1",2,1),
-                new Temp(id++,"产品1","类型1",3,1),
-                new Temp(id++,"产品1","类型1",4,1),
-                new Temp(id++,"产品2","类型2",4,0),
-                new Temp(id++,"产品3","类型3",4,0)
+                new Temp(id++, "产品1", "类型1", 1, 0),
+                new Temp(id++, "产品1", "类型1", 2, 1),
+                new Temp(id++, "产品1", "类型1", 3, 1),
+                new Temp(id++, "产品1", "类型1", 4, 1),
+                new Temp(id++, "产品2", "类型2", 4, 0),
+                last
         );
         List<Temp> now = Arrays.asList(
-                new Temp(id++,"产品1","类型1",9,0),
-                new Temp(id++,"产品2","类型2",43,0),
-                new Temp(id++,"产品4","类型4",95,0)
+                new Temp(id++, "产品1", "类型1", 9, 0),
+                new Temp(id++, "产品2", "类型2", 43, 0),
+                new Temp(id++, "产品4", "类型4", 95, 0)
         );
         DataDaoVo<Temp> init = DataDaoVo.init(his, now, new DataDaoKey<Temp>() {
             @Override
@@ -58,8 +59,9 @@ public class DataDaoVoTest {
                 return StringHelper.getId(from.productId, from.productType);
             }
         });
-        Assert.assertEquals(init.getCreates().size(),1);
-        Assert.assertEquals(init.getUpdates().size(),2);
-        Assert.assertEquals(init.getRemoves().size(),4);
+        Assert.assertEquals(init.getCreates().size(), 1);
+        Assert.assertEquals(init.getUpdates().size(), 2);
+        Assert.assertEquals(init.getRemoves().size(), 4);
+        Assert.assertEquals(last.removeFlag, 1);
     }
 }

yzg-util-db/src/main/java/com/yanzuoguang/dao/DaoConst.java

@@ -141,7 +141,7 @@ public class DaoConst {
     /**
      * 更新字段模板参数
      */
-    public static final String CODE_UPDATE_FIELD_REMOVE = ",a.%s=IFNULL(?,1)";
+    public static final String CODE_UPDATE_FIELD_REMOVE = ",a.%s=CASE WHEN a.%s THEN 0 AND IFNULL(?,0)=0 THEN 1 ELSE IFNULL(?,1) END";
     /**
      * 等于条件
      */

yzg-util-db/src/main/java/com/yanzuoguang/dao/impl/TableStruct.java

@@ -692,7 +692,7 @@ public class TableStruct {
         // 设置删除标记可以通过前台传入
         if (remove != null) {
             sql.addParaConst(remove.inputName,
-                    CODE_FIELD, String.format(CODE_UPDATE_FIELD_REMOVE, remove.name));
+                    CODE_FIELD, String.format(CODE_UPDATE_FIELD_REMOVE, remove.name, remove.name));
         }
     }