2019-09-09 11:41

src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java

@@ -9,7 +9,7 @@ public class Settlement {
     private String remarks;//备注
     private String status;//数据核对 0-核对一致 1-核对不一致
     private String theAmount;//比对金额:json
-    private String reason;//原因
+    private String delFlag;//删除
 
     public String getId() {
         return id;
@@ -58,12 +58,12 @@ public class Settlement {
         this.theAmount = theAmount;
     }
 
-    public String getReason() {
-        return reason;
+    public String getDelFlag() {
+        return delFlag;
     }
 
-    public void setReason(String reason) {
-        this.reason = reason;
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
     }
 
     @Override
@@ -75,7 +75,7 @@ public class Settlement {
                 ", remarks='" + remarks + '\'' +
                 ", status='" + status + '\'' +
                 ", theAmount='" + theAmount + '\'' +
-                ", reason='" + reason + '\'' +
+                ", delFlag='" + delFlag + '\'' +
                 '}';
     }
 }

src/main/java/com/jeeplus/modules/sg/overheadline/entity/SettlementCount.java

@@ -1,11 +0,0 @@
-package com.jeeplus.modules.sg.overheadline.entity;
-
-public class SettlementCount {
-    private String fbfx;
-    private String cbrcg;
-    private String csf;
-    private String qt;
-    private String gf;
-    private String sj;
-
-}

src/main/java/com/jeeplus/modules/sg/project/entity/WbsItem.java

@@ -13,17 +13,17 @@ public class WbsItem extends DataEntity<WbsItem> {
     private String parentNode; //父节点
     private String type; //项目类型
     private Date createDate;  //创建时间
-//    private String delFlag;//是否删除
-
-//    @Override
-//    public String getDelFlag() {
-//        return delFlag;
-//    }
-//
-//    @Override
-//    public void setDelFlag(String delFlag) {
-//        this.delFlag = delFlag;
-//    }
+    private String delFlag;//是否删除
+
+    @Override
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
 
     @Override
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/com/jeeplus/modules/sg/project/entity/WbsProject.java

@@ -9,6 +9,7 @@ public class WbsProject extends DataEntity<WbsProject> {
     private int number;  //项目数量
     private String userName; //创建人
     private String parentNode; //父节点
+    private String delFlag;//是否删除
 
     private List<WbsItem> wbsItems; //项目
 
@@ -52,4 +53,10 @@ public class WbsProject extends DataEntity<WbsProject> {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    @Override
+    public String getDelFlag() { return delFlag;}
+
+    @Override
+    public void setDelFlag(String delFlag) {this.delFlag = delFlag;}
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/ItemMapper.java

@@ -18,5 +18,5 @@ public interface ItemMapper extends BaseMapper<WbsItem> {
     List<WbsItem> findItemByName(@Param("itemName")String itemName,@Param("projectId") String projectId);
 
     //删除项目
-//    Integer  updateItem(WbsItem wbsItem);
+    Integer  updateItem(WbsItem wbsItem);
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/ProjectMapper.java

@@ -2,6 +2,10 @@ package com.jeeplus.modules.sg.project.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.overheadline.entity.JkxlAdjustFee;
+import com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee;
+import com.jeeplus.modules.sg.overheadline.entity.Settlement;
+import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import org.apache.ibatis.annotations.Param;
@@ -15,4 +19,22 @@ public interface ProjectMapper extends BaseMapper<WbsProject> {
     void updateNum(@Param("number") int number,@Param("id") String id);
 //    int update(WbsProject wbsProject);
     List<WbsProject> findByName(String projectName);
+
+    //工程删除
+    Integer deleteProject(WbsProject wbsProject);
+
+    //查找工程下所有项目
+    List<WbsItem> findItem(String parentId);
+
+    //删除工程下项目
+    Integer deleteItem(@Param(value = "wbsItems")List<WbsItem> wbsItems);
+
+    //删除结算
+    Integer deleteItemCount(@Param(value = "settlements")List<Settlement> settlements);
+
+//    //删除其他费用表
+//    Integer deleteItemDetail(@Param(value = "jkxlDetailFees")List<JkxlDetailFee> jkxlDetailFees);
+//
+//    //删除差额
+//    Integer deleteItemAdjust(@Param(value = "jkxlDetailFees")List<JkxlAdjustFee> jkxlAdjustFees);
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -148,7 +148,7 @@
 		DELETE FROM sg_wbs_item where id = #{id}
 	</delete>
 
-	<!--<update id="updateItem" parameterType="WbsItem">-->
-		<!--update sg_wbs_item set del_flag = #{delFlag} where id=#{id}-->
-	<!--</update>-->
+	<update id="updateItem" parameterType="WbsItem">
+		update sg_wbs_item set del_flag = #{delFlag} where id=#{id}
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -148,4 +148,57 @@
 		select * FROM sg_wbs_project  where ${propertyName} = '${value}'
 	</select>
 
+	<!-- 根据工程id查找项目 -->
+	<select id="findItem" parameterType="String" resultMap="WbsProject">
+		select * From sg_wbs_item where project_id = #{id}
+	</select>
+
+	<!-- 根据工程id删除项目 -->
+	<update id="deleteItem" parameterType="java.util.List">
+		<foreach collection="wbsItems" item="wbsItem" index="index" open="" close="" separator=";">
+			UPDATE sg_wbs_item
+			<set>
+				<if test="wbsItem.parentId != null and wbsItem.parentId  != ''">
+					del_flag = #{wbsItem.delFlag,jdbcType=VARCHAR},
+				</if>
+			</set>
+			<where>
+				ID = #{wbsItem.parentId,jdbcType=VARCHAR}
+			</where>
+		</foreach>
+	</update>
+
+	<!-- 根据工程id逻辑删除结算表 -->
+	<update id="deleteItemCount" parameterType="java.util.List">
+		<foreach collection="settlements" item="settlement" index="index" open="" close="" separator=";">
+			UPDATE sg_sett_count
+			<set>
+				<if test="wbsItem.id != null and wbsItem.id != ''">
+					del_flag = #{settlement.delFlag,jdbcType=VARCHAR},
+				</if>
+			</set>
+			<where>
+				ID = #{settlement.id,jdbcType=VARCHAR}
+			</where>
+		</foreach>
+	</update>
+
+	<!--&lt;!&ndash; 根据工程id逻辑删除项目 &ndash;&gt;-->
+	<!--<update id="deleteItemDetail" parameterType="java.util.List">-->
+		<!--<foreach collection="settlements" item="settlement" index="index" open="" close="" separator=";">-->
+			<!--UPDATE sg_sett_count-->
+			<!--<set>-->
+				<!--<if test="wbsItem.parentId != null and wbsItem.parentId  != ''">-->
+					<!--del_flag = #{wbsItem.delFlag,jdbcType=VARCHAR},-->
+				<!--</if>-->
+			<!--</set>-->
+			<!--<where>-->
+				<!--ID = #{wbsItem.parentId,jdbcType=VARCHAR}-->
+			<!--</where>-->
+		<!--</foreach>-->
+	<!--</update>-->
+	<!-- 逻辑删除工程id -->
+	<update id="deleteProject" parameterType="WbsProject">
+	  	update sg_wbs_project set del_flag = #{delFlag} where id = #{id}
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/project/service/ItemService.java

@@ -50,6 +50,6 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
         return itemMapper.findItemByName(itemName,projectId);
     }
     //删除
-//    @Transactional(readOnly = false)
-//    public void updateItem(WbsItem wbsItem){ itemMapper.updateItem(wbsItem); }
+    @Transactional(readOnly = false)
+    public void deleteItem(WbsItem wbsItem){ itemMapper.updateItem(wbsItem); }
 }

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -3,6 +3,7 @@ package com.jeeplus.modules.sg.project.service;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.overheadline.entity.Settlement;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
@@ -80,4 +81,22 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
     public void delete(WbsProject wbsProject) {
         super.delete(wbsProject);
     }
+
+    @Transactional(readOnly = false)
+    public Integer deleteProject(WbsProject wbsProject){
+        return projectMapper.deleteProject(wbsProject);
+    }
+
+    public List<WbsItem> findItem(String parentId){
+        return projectMapper.findItem(parentId);
+    }
+
+    @Transactional(readOnly = false)
+    public Integer deleteItem(List<WbsItem> wbsItems){
+        return projectMapper.deleteItem(wbsItems);
+    }
+    @Transactional(readOnly = false)
+    public Integer deleteItemCount(List<Settlement> settlements){
+        return projectMapper.deleteItemCount(settlements);
+    }
 }

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -5,6 +5,7 @@ import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee;
+import com.jeeplus.modules.sg.overheadline.entity.Settlement;
 import com.jeeplus.modules.sg.overheadline.service.OverheadLineService;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
@@ -226,4 +227,23 @@ public class ProjectController extends BaseController {
         return newDate+result;
     }
 
+    /**
+     * 删除
+     */
+    @RequestMapping("/deleteProject")
+    @ResponseBody
+    public AjaxJson deleteProject(WbsProject wbsProject){
+        AjaxJson j = new AjaxJson();
+        try {
+          List<WbsItem> wbsItems =  projectService.findItem(wbsProject.getId());
+          if (!wbsItems.isEmpty()){
+              projectService.deleteItem(wbsItems);
+          }
+          projectService.deleteProject(wbsProject);
+        }catch (Exception e){
+            j.setSuccess(false);
+            j.setMsg("删除失败");
+        }
+        return j;
+    }
 }

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -200,15 +200,15 @@ public class ProjectTemController extends BaseController {
         map.put("msg","导入成功");
         return map;
     }
-//    //删除项目
-//    @RequestMapping("/deleteItem")
-//    @ResponseBody
-//    public AjaxJson deleteItem(WbsItem wbsItem){
-//        wbsItem.setDelFlag("1");
-//        AjaxJson j = new AjaxJson();
-//            itemService.updateItem(wbsItem);
-//            j.setSuccess(true);
-//            j.setMsg("删除成功");
-//        return j;
-//    }
+    //删除项目
+    @RequestMapping("/deleteItem")
+    @ResponseBody
+    public AjaxJson deleteItem(WbsItem wbsItem){
+        wbsItem.setDelFlag("1");
+        AjaxJson j = new AjaxJson();
+            itemService.deleteItem(wbsItem);
+            j.setSuccess(true);
+            j.setMsg("删除成功");
+        return j;
+    }
 }

src/main/resources/j2cache/j2cache.properties

@@ -88,8 +88,8 @@ redis.cluster_name = j2cache
 redis.namespace = 
 
 ## connection
-redis.hosts = 192.168.2.4:6379
-#redis.hosts = 127.0.0.1:6379
+#redis.hosts = 192.168.2.4:6379
+redis.hosts = 127.0.0.1:6379
 redis.timeout = 2000
 redis.password =
 redis.database = 0

src/main/resources/properties/jeeplus.properties

@@ -14,10 +14,10 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
-#jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://localhost:3306/guowang?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/guowang?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-jdbc.password=root
+jdbc.password=123456
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
 

src/main/webapp/webpage/modules/sg/project/management.js

@@ -53,7 +53,7 @@ layui.config({
                                 +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"
                                 +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>"
                                 +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>"
-                                +"<a class='layui-btn layui-btn-xs layui-btn-danger' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">删除</a>";
+                                +"<a class='layui-btn layui-btn-xs layui-btn-danger' onclick='deleteProject("+d.id+")'>删除</a>";
                         }
                         if(d.status==2){
                             xml +="<span class='myspan'>操作</span>";
@@ -208,6 +208,7 @@ function update(url) {
         }
     })
 }
+//逻辑删除项目
 function deleteItem(id) {
     $.ajax({
         type: "post",
@@ -225,8 +226,25 @@ function deleteItem(id) {
         }
     })
 }
+//删除工程
+function deleteProject(id) {
+    $.ajax({
+        type: "post",
+        url: "${ctx}/project/deleteProject",
+        data:{'id':id},
+        dataType: "json",
+        success: function(data){
+            if(data.success){
+                alert(data.msg);
+                layer.msg(data.msg, {icon: 6});
+                window.location.reload();
+            }else{
+                layer.msg(data.msg, {icon: 5});
+            }
+        }
+    })
+}
 $(document).ready(function(e) {
-
     $("#noneBtn").click(function(e) {
         $("#noneDiv").toggle();
     })

src/main/webapp/webpage/modules/sg/projecttem/addItem2Form.jsp

@@ -17,6 +17,8 @@
         .layui-btn-mysele{width: 70px;}
         .mydiv1:empty:before{content: attr(placeholder);color:#999999;}
         .mydiv1:focus:before{content:none}
+        .layui-table-tips-main{display:none}
+        .layui-table-tips-c{display:none}
     </style>
 </head>
 <body>