Merge remote-tracking branch 'origin/master'

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

@@ -19,5 +19,35 @@ 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);
+
+    /**
+     * 根据工程id删除
+     * @param parentId 工程id
+     * @return
+     */
+    Integer deleteItem(String parentId);
+
+    /**
+     * 根据项目id删除结算
+     */
+    Integer deleteCount(String itemId);
+
+    /**
+     * 根据项目id删除 其他项目
+     */
+    Integer deleteAdjust(String itemId);
+
+    /**
+     * 根据项目id删除 差额
+     */
+    Integer deleteDetail(String itemId);
+
+    //查找工程下所有项目
+    List<WbsItem> findItem(String parentId);
+
+    /**
+     * 根据id查找当前所有项目
+     */
+    WbsItem findItemById(String id);
 }

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

@@ -23,18 +23,9 @@ public interface ProjectMapper extends BaseMapper<WbsProject> {
     //工程删除
     Integer deleteProject(WbsProject wbsProject);
 
-    //查找工程下所有项目
-    List<WbsItem> findItem(String parentId);
+    //根据id查找工程
+    WbsProject findProjectById(String id);
 
-    //删除工程下项目
-    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);
+    //根据id修改工程数量
+    Integer updateProNumber(WbsProject wbsProject);
 }

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

@@ -144,11 +144,52 @@
 		WHERE item_name = #{itemName} and project_id =#{projectId}
 	</select>
 
-	<delete id="deleteItem" parameterType="String">
-		DELETE FROM sg_wbs_item where id = #{id}
-	</delete>
+	<!--<delete id="deleteItem" parameterType="String">-->
+		<!--DELETE FROM sg_wbs_item where id = #{id}-->
+	<!--</delete>-->
+
+
+
+	<!--1-->
 
 	<update id="updateItem" parameterType="WbsItem">
 		update sg_wbs_item set del_flag = #{delFlag} where id=#{id}
 	</update>
+	<!-- 根据工程id查找项目 -->
+	<select id="findItem" parameterType="String" resultType="WbsItem">
+		select * From sg_wbs_item where project_id = #{id}
+	</select>
+
+	<!--根据工程id逻辑删除项目-->
+	<update id = "deleteItem">
+		update sg_wbs_item set del_flag = 1 where project_id = #{parentId}
+	</update>
+
+	<!--根据项目 id 删除结算信息-->
+	<update id="deleteCount">
+		update sg_sett_count set del_flag = 1 where id = #{itemId}
+	</update>
+
+	<!--根据项目 id 删除其他信息-->
+	<update id="deleteAdjust">
+		update sg_fee_adjust_jkxl set del_flag = 1 where id = #{itemId}
+	</update>
+
+	<!--根据项目 id 删除差额-->
+	<update id="deleteDetail">
+		update sg_fee_detail_jkxl set del_flag = 1 where id = #{itemId}
+	</update>
+
+	<!--根据项目id查找当前项目所有信息-->
+	<select id="findItemById" parameterType="String" resultType="com.jeeplus.modules.sg.project.entity.WbsItem">
+		SELECT
+		id AS id,
+		unit AS unit,
+		item_name AS itemName,
+		project_id AS projectId,
+		parent_node AS parentNode,
+		create_date AS createDate
+		FROM sg_wbs_item
+		WHERE id=#{id}
+	</select>
 </mapper>

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

@@ -149,57 +149,18 @@
 		select * FROM sg_wbs_project  where ${propertyName} = '${value}'
 	</select>
 
-	<!-- 根据工程id查找项目 -->
-	<select id="findItem" parameterType="String" resultType="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 -->
+	<!--1-->
+	<!--逻辑删除工程id -->
 	<update id="deleteProject" parameterType="WbsProject">
 	  	update sg_wbs_project set del_flag = #{delFlag} where id = #{id}
 	</update>
+	<!--根据id查找当前工程所有信息-->
+	<select id="findProjectById" parameterType="String" resultType="com.jeeplus.modules.sg.project.entity.WbsProject">
+		select * from sg_wbs_project where id = #{id}
+	</select>
+
+	<!--根据工程id修改工程下项目数量-->
+	<update id="updateProNumber" parameterType="WbsProject">
+		update sg_wbs_project set number = #{number} where id=#{id}
+	</update>
 </mapper>

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

@@ -49,7 +49,37 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
     public List<WbsItem> findItemByName(String itemName,String projectId){
         return itemMapper.findItemByName(itemName,projectId);
     }
+
     //删除
     @Transactional(readOnly = false)
-    public void deleteItem(WbsItem wbsItem){ itemMapper.updateItem(wbsItem); }
+    public Integer updateItem(WbsItem wbsItem){ return itemMapper.updateItem(wbsItem); }
+
+    //根据工程删除 项目
+    @Transactional(readOnly = false)
+    public Integer deleteItem(String parentId){
+        return itemMapper.deleteItem(parentId);
+    }
+    //根据项目删除结算
+    @Transactional(readOnly = false)
+    public Integer deleteCount(String itemId){
+        return itemMapper.deleteCount(itemId);
+    }
+    //根据工程删除 项目
+    @Transactional(readOnly = false)
+    public Integer deleteAdjust(String itemId){
+        return itemMapper.deleteAdjust(itemId);
+    }
+    //根据工程删除 项目
+    @Transactional(readOnly = false)
+    public Integer deleteDetail(String itemId){
+        return itemMapper.deleteDetail(itemId);
+    }
+
+    public List<WbsItem> findItem(String parentId){
+        return itemMapper.findItem(parentId);
+    }
+
+    public WbsItem findItemById(String id){
+        return itemMapper.findItemById(id);
+    }
 }

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

@@ -101,16 +101,12 @@ public class ProjectService extends CrudService<ProjectMapper, 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);
+    public Integer updateProjectNUmber(WbsProject wbsProject){
+        return projectMapper.updateProNumber(wbsProject);
     }
-    @Transactional(readOnly = false)
-    public Integer deleteItemCount(List<Settlement> settlements){
-        return projectMapper.deleteItemCount(settlements);
+
+    public WbsProject findProjectById(String id){
+        return projectMapper.findProjectById(id);
     }
 }

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

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sg.overheadline.service.OverheadLineService;
 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 com.jeeplus.modules.sg.project.service.ItemService;
 import com.jeeplus.modules.sg.project.service.ProjectService;
 import com.jeeplus.modules.sg.project.util.ExportUtil;
 import com.jeeplus.modules.sg.substation.service.SubstationService;
@@ -43,6 +44,8 @@ public class ProjectController extends BaseController {
     private OverheadLineService overheadLineService;
     @Autowired
     private SubstationService substationService;
+    @Autowired
+    private ItemService itemService;
 
 
 
@@ -236,12 +239,18 @@ public class ProjectController extends BaseController {
     @ResponseBody
     public AjaxJson deleteProject(WbsProject wbsProject){
         AjaxJson j = new AjaxJson();
+        j.setSuccess(true);
+        j.setMsg("操作成功");
         try {
-          List<WbsItem> wbsItems =  projectService.findItem(wbsProject.getId());
-          if (!wbsItems.isEmpty()){
-              projectService.deleteItem(wbsItems);
-          }
-          projectService.deleteProject(wbsProject);
+//          List<WbsItem> wbsItems = itemService.findItem(wbsProject.getId());
+//            for (int i = 0; i < wbsItems.size(); i++) {
+//                itemService.deleteCount(wbsItems.get(i).getId());
+//                itemService.deleteAdjust(wbsItems.get(i).getId());
+//                itemService.deleteDetail(wbsItems.get(i).getId());
+//            }
+            itemService.deleteItem(wbsProject.getId());
+            wbsProject.setDelFlag("1");
+            projectService.deleteProject(wbsProject);
         }catch (Exception e){
             j.setSuccess(false);
             j.setMsg("删除失败");

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

@@ -202,15 +202,26 @@ public class ProjectTemController extends BaseController {
         map.put("msg","导入成功");
         return map;
     }
+
     //删除项目
     @RequestMapping("/deleteItem")
     @ResponseBody
     public AjaxJson deleteItem(WbsItem wbsItem){
+        WbsItem wbsItem1 = itemService.findItemById(wbsItem.getId());
+        WbsProject wbsProject = projectService.findProjectById(wbsItem1.getProjectId());
+        Integer number = wbsProject.getNumber()-1;
+        wbsProject.setNumber(number);
         wbsItem.setDelFlag("1");
         AjaxJson j = new AjaxJson();
-            itemService.deleteItem(wbsItem);
+        try {
+            itemService.updateItem(wbsItem);
+            projectService.updateProjectNUmber(wbsProject);
             j.setSuccess(true);
             j.setMsg("删除成功");
+        }catch (Exception e){
+            j.setSuccess(false);
+            j.setMsg("删除失败");
+        }
         return j;
     }
 }

src/main/webapp/webpage/modules/sg/free/alongst.js

@@ -48,7 +48,7 @@
     layer.msg('请输入有效数字');
     return false;
 }
-    var bfb = (blvalue*moneycount).toFixed(2);
+    var bfb = (blvalue*moneycount);
     var w = $(this).closest("tr").find("td").eq("4").find("div").html(bfb);
     data.fee=bfb;
 }else{
@@ -64,7 +64,7 @@
     layer.msg('请输入有效数字');
     return false;
 }
-    var bfb2 = (feevalue*100).toFixed(2);
+    var bfb2 = (feevalue*100);
     $(this).closest("tr").find("td").eq("3").find("div").html(bfb2);
     data.bl=bfb2;
 }

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

@@ -60,7 +60,7 @@ layui.config({
                         }
                         if(d.status==3){
                             xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>"
-                                +"<button class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteItem('"+d.id+"')\">删除</button>";
+                                +"<a class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteItem('" + d.id + "')\">删除</a>";
                         }
 
                         return xml;
@@ -210,6 +210,7 @@ function update(url) {
 }
 //逻辑删除项目
 function deleteItem(id) {
+    alert(id)
     $.ajax({
         type: "post",
         url: "${ctx}/project/tem/deleteItem",