Forráskód Böngészése

重新添加项目基本信息删除,拆旧信息删除,交底计划安排信息拆除,新增项目重置项目状态,修改项目状态,删除年度物资上报以外的数据

[user3] 4 éve
szülő
commit
555e5376cf

+ 29 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/MaterialProjectMapper.java

@@ -13,7 +13,12 @@ import java.util.List;
 
 @MyBatisMapper
 public interface MaterialProjectMapper extends BaseMapper<MaterialProject> {
+    /**
+     *获取所有的批次
+     * */
     List<MaterialProject> findBatch();
+
+
     List<MaterialProject> findByList(@Param("list") List<MaterialProject> list);
 
     Integer insertList(@Param("list") List<MaterialProject> list);
@@ -91,4 +96,28 @@ public interface MaterialProjectMapper extends BaseMapper<MaterialProject> {
      * @param reserveProjectName 储备项目名称
      */
     void deleteUploadImages(String reserveProjectName);
+
+    /**
+     * 删除施工任务分配信息(xm_project_assignment)
+     * @param reserveProjectName 储备项目名称
+     * */
+    void deleteProjectAss(String reserveProjectName);
+
+    /**
+     * 删除交底计划安排信息(xm_project_disclosureplan)
+     * @param reserveProjectName 储备项目名称
+     * */
+    void deleteProjectDis(String reserveProjectName);
+
+    /**
+     * 删除项目前期基础信息(xm_project_basicinformation)
+     * @param reserveProjectName 储备项目名称
+     */
+    void deleteProjectBas(String reserveProjectName);
+
+    /**
+     * 重置项目信息
+     * @param materialProject
+     * */
+    void resetProject(MaterialProject materialProject);
 }

+ 31 - 2
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/mapper/xml/MaterialProjectMapper.xml

@@ -331,7 +331,6 @@
 
 
 
-
     <!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
     <select id="findUniqueByProperty" resultType="TestNote" statementType="STATEMENT">
         select *
@@ -399,5 +398,35 @@
         from xm_upload_images
         where reserveProjectName = #{reserveProjectName}
     </delete>
-
+    <delete id="deleteProjectAss">
+        delete
+        from xm_project_assignment
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteProjectDis">
+        delete
+        from xm_project_disclosureplan
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <delete id="deleteProjectBas">
+        delete
+        from xm_project_basicinformation
+        where reserveProjectName = #{reserveProjectName}
+    </delete>
+    <update id="resetProject">
+        update xm_material_project
+        set status              = '0',
+            acquisitionStatus   = '0',
+            advanceStatus       = '0',
+            constructionStatus  = '0',
+            whetherCloseStatus  = '0',
+            settStatus          = '0',
+            policyStatus        = '0',
+            earlyMaterial       = '0',
+            preConstruction     = '0',
+            canEnter            = '0',
+            advanceConstruction = '0',
+            arrageProject       = '0'
+        where id = #{id}
+    </update>
 </mapper>

+ 82 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/service/MaterialProjectService.java

@@ -68,6 +68,85 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		//删除年度物资上报信息
 		materialInfoMapper.deleteByOld(reserveProjectName);
 		/**
+		 * 删除项目前期基础信息(xm_project_basicinformation)
+		 */
+		materialProjectMapper.deleteProjectBas(reserveProjectName);
+		/**
+		 * 删除施工任务分配信息(xm_project_assignment)
+		 * */
+		materialProjectMapper.deleteProjectAss(reserveProjectName);
+		/**
+		 * 删除交底计划安排信息(xm_project_disclosureplan)
+		 * */
+		materialProjectMapper.deleteProjectDis(reserveProjectName);
+		/**
+		 * 删除施工交底流程信息(xm_construction_clarificaiton)
+		 * */
+		materialProjectMapper.deleteConstruction(reserveProjectName);
+		/**
+		 * 删除拆旧表信息(xm_tear_down)
+		 */
+		materialProjectMapper.deleteXmTearDown(reserveProjectName);
+		/**
+		 * 删除土建工程量信息(xm_engineering_amount)
+		 */
+		materialProjectMapper.deleteEngineeringAmount(reserveProjectName);
+		/**
+		 * 删除其它工程量信息(xm_other_amount)
+		 */
+		materialProjectMapper.deleteOtherAmount(reserveProjectName);
+		/**
+		 * 删除物资领料流程信息(md_acquisition_process)
+		 */
+		materialProjectMapper.deleteAcqProcess(reserveProjectName);
+		/**
+		 * 删除土建流程信息(xm_nonpower_process)
+		 */
+		materialProjectMapper.deleteNonProcess(reserveProjectName);
+		/**
+		 * 删除施工验收(电气)流程信息(sg_construction_process)
+		 */
+		materialProjectMapper.deleteConProcess(reserveProjectName);
+		/**
+		 * 删除转资流程信息(xm_fund_process)
+		 */
+		materialProjectMapper.deleteFundProcess(reserveProjectName);
+		/**
+		 * 结算验收流程信息(xm_settlement_process)
+		 */
+		materialProjectMapper.deleteSettProcess(reserveProjectName);
+		/**
+		 * 删除施工验收流程-上传签字版政策处理清单/缴费单(xm_construction_upload)
+		 */
+		materialProjectMapper.deleteConUpload(reserveProjectName);
+		/**
+		 * 删除项目上传信息(xm_upload_images)
+		 */
+		materialProjectMapper.deleteUploadImages(reserveProjectName);
+	}
+
+	/**
+	 * 重置项目
+	 */
+	@Transactional(readOnly = false)
+	public void resetProject(MaterialProject materialProject) {
+		materialProjectMapper.resetProject(materialProject);
+		String reserveProjectName = materialProject.getReserveProjectName();
+		/**
+		 * 删除项目前期基础信息(xm_project_basicinformation)
+		 */
+		materialProjectMapper.deleteProjectBas(reserveProjectName);
+		/**
+		 * 删除施工任务分配信息(xm_project_assignment)
+		 * */
+		materialProjectMapper.deleteProjectAss(reserveProjectName);
+
+		/**
+		 * 删除交底计划安排信息(xm_project_disclosureplan)
+		 * */
+		materialProjectMapper.deleteProjectDis(reserveProjectName);
+
+		/**
 		 * 删除施工交底流程信息(xm_construction_clarificaiton)
 		 * */
 		materialProjectMapper.deleteConstruction(reserveProjectName);
@@ -113,7 +192,9 @@ public class MaterialProjectService extends CrudService<MaterialProjectMapper, M
 		materialProjectMapper.deleteUploadImages(reserveProjectName);
 	}
 
-	//文件导入
+	/**
+	 * 文件导入
+	 * */
 	@Transactional(readOnly = false)
 	public void replaceList(List<MaterialProject> list){
 		for (MaterialProject materialProject:list){

+ 18 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/web/MaterialProjectController.java

@@ -239,7 +239,7 @@ public class MaterialProjectController extends BaseController {
     @RequestMapping(value = "deleteAll")
     public AjaxJson deleteAll(String ids) {
         AjaxJson j = new AjaxJson();
-        String idArray[] = ids.split(",");
+        String[] idArray = ids.split(",");
         for (String id : idArray) {
             materialProjectService.delete(materialProjectService.get(id));
         }
@@ -247,6 +247,23 @@ public class MaterialProjectController extends BaseController {
         return j;
     }
 
+
+    /**
+     * 批量重置
+     */
+    @ResponseBody
+    @RequiresPermissions("managementcenter:materialproject:reset")
+    @RequestMapping(value = "reset")
+    public AjaxJson reset(String ids) {
+        AjaxJson j = new AjaxJson();
+        String[] idArray = ids.split(",");
+        for (String id : idArray) {
+            materialProjectService.resetProject(materialProjectService.get(id));
+        }
+        j.setMsg("重置项目成功");
+        return j;
+    }
+
     /**
      * 物料列表导出
      */

+ 6 - 1
src/main/webapp/webpage/modules/sg/managementcenter/materialproject/materialProjectList.jsp

@@ -75,7 +75,12 @@
 			<div id="toolbar">
 				<shiro:hasPermission name="managementcenter:materialproject:del">
 					<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
-						<i class="glyphicon glyphicon-remove"></i> 删除
+						<i class="glyphicon glyphicon-remove"></i> 删除项目所有信息
+					</button>
+				</shiro:hasPermission>
+				<shiro:hasPermission name="managementcenter:materialproject:reset">
+					<button id="remove" class="btn btn-danger" disabled onclick="reset()">
+						<i class="glyphicon glyphicon-remove"></i> 重置项目(保留基础信息)
 					</button>
 				</shiro:hasPermission>
 				<shiro:hasPermission name="managementcenter:materialproject:import">