施工验收流程涉电部分

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/ShowListMapper.java

@@ -123,6 +123,7 @@ public interface ShowListMapper extends BaseMapper<ShowList> {
      * */
     String findAcqStatus(ShowList showList);
 
+
     List<ExportListing> exportListing(List<String> list);
 
     /**

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -167,7 +167,7 @@
 	from md_process_list where procInsId = #{procInsId}
 	</select>
 
-	<select id="findNewTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+    <select id="findNewTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
 	SELECT
 		id,
 		procInsId,
@@ -184,28 +184,28 @@
 	from md_temporary_list where procInsId = #{procInsId}
 	</select>
 
-	<select id="inventoryComparisonData" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
-	SELECT
-		id,
-		procInsId,
-		materialCode,
-		extensionDescription,
-		materialDescription,
-		mdUnits,
-		mdTotalAmount,
-		mdSingleWeight,
-		mdTotalWeight,
-		mdTheParty,
-		mdText
-	from md_process_list where procInsId in
-	(
-	<foreach collection="list" item="item" separator=",">
-		#{item}
-	</foreach>
-	)
-	</select>
+    <select id="inventoryComparisonData" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+        SELECT
+        id,
+        procInsId,
+        materialCode,
+        extensionDescription,
+        materialDescription,
+        mdUnits,
+        mdTotalAmount,
+        mdSingleWeight,
+        mdTotalWeight,
+        mdTheParty,
+        mdText
+        from md_process_list where procInsId in
+        (
+        <foreach collection="list" item="item" separator=",">
+            #{item}
+        </foreach>
+        )
+    </select>
 
-	<select id="findOneList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+    <select id="findOneList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
 	SELECT
 		id,
 		procInsId,
@@ -222,7 +222,7 @@
 	</select>
 
 
-	<select id="itemQuery" resultType="string">
+    <select id="itemQuery" resultType="string">
 		select select_number from md_acquisition_process where proc_ins_id = #{procInsId}
 	</select>
 
@@ -233,7 +233,8 @@
 		where id = #{id};
 	</update>
 
-	<select id="findOneTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+
+    <select id="findOneTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
 	SELECT
 		id,
 		procInsId,
@@ -249,109 +250,110 @@
 	from md_temporary_list where id = #{id}
 	</select>
 
-	<update id="updateTemAmount">
+    <update id="updateTemAmount">
 		update md_temporary_list
 		set mdTotalAmount = #{mdTotalAmount},
 			mdTotalWeight=#{mdTotalWeight}
 		where id = #{id};
 	</update>
 
-	<delete id="deleteTemData">
+    <delete id="deleteTemData">
 		delete from md_temporary_list where id=#{id};
 	</delete>
 
 
-	<delete id="deleteData">
+    <delete id="deleteData">
 		delete from md_process_list where id=#{id};
 	</delete>
 
-	<select id="inventoryQuery" resultType="com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory">
-		select materialCode,availableStockQuantity,materialDetail from xm_material_inventory
-		where materialCode in
-		(
-		<foreach collection="list" item="item" separator=",">
-			#{item.materialCode}
-		</foreach>
-		)
-	</select>
+    <select id="inventoryQuery"
+            resultType="com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory">
+        select materialCode,availableStockQuantity,materialDetail from xm_material_inventory
+        where materialCode in
+        (
+        <foreach collection="list" item="item" separator=",">
+            #{item.materialCode}
+        </foreach>
+        )
+    </select>
 
-	<select id="processListQuery" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
-		select materialCode,mdTotalAmount,extensionDescription,materialDescription from md_process_list
-		where procInsId in
-		(
-		<foreach collection="list" item="item" separator=",">
-			#{item}
-		</foreach>
-		)
-	</select>
+    <select id="processListQuery" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+        select materialCode,mdTotalAmount,extensionDescription,materialDescription from md_process_list
+        where procInsId in
+        (
+        <foreach collection="list" item="item" separator=",">
+            #{item}
+        </foreach>
+        )
+    </select>
 
-	<select id="acquisitionList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.Acquisition">
-		select
-		a.id,
-		a.proc_ins_id,
-		b.require_name as projectId,
-		b.pro_type as proType,
-		a.version,
-		a.the_number,
-		a.select_number,
-		a.exportStatus,
-		a.exportAfter,
-		a.exportTime,
-		a.managerTime
-		from md_acquisition_process as a
-		left join xm_project_details as b
-		on a.project_id = b.id
-		where exportStatus = '1'
-		<if test="projectId != null and projectId != ''">
-			AND b.require_name LIKE concat('%',#{projectId},'%')
-		</if>
-		order by managerTime desc,exportAfter desc
-	</select>
+    <select id="acquisitionList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.Acquisition">
+        select
+        a.id,
+        a.proc_ins_id,
+        b.require_name as projectId,
+        b.pro_type as proType,
+        a.version,
+        a.the_number,
+        a.select_number,
+        a.exportStatus,
+        a.exportAfter,
+        a.exportTime,
+        a.managerTime
+        from md_acquisition_process as a
+        left join xm_project_details as b
+        on a.project_id = b.id
+        where exportStatus = '1'
+        <if test="projectId != null and projectId != ''">
+            AND b.require_name LIKE concat('%',#{projectId},'%')
+        </if>
+        order by managerTime desc,exportAfter desc
+    </select>
 
-	<update id="updateManagerTime">
+    <update id="updateManagerTime">
 		update md_acquisition_process set managerTime = NOW(),exportStatus = 1 where proc_ins_id = #{procInsId};
 	</update>
 
-	<select id="selectAllId" resultType="java.lang.String">
+    <select id="selectAllId" resultType="java.lang.String">
 		select
 		a.id
 		from md_acquisition_process as a
 		where exportStatus = '1'
 	</select>
-	
-	<update id="updateAcqStatus">
+
+    <update id="updateAcqStatus">
 		update xm_project_details set acquisition_status = 1 where id = #{projectId};
 	</update>
 
-	<select id="findAcqStatus" resultType="java.lang.String">
+    <select id="findAcqStatus" resultType="java.lang.String">
 		select acquisition_status from xm_project_details where id = #{projectId};
 	</select>
 
-	<select id="exportListing" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ExportListing">
-		select
-		a.md_big_class AS "mdBigClass",
-		a.md_the_class AS "mdTheClass",
-		a.md_name AS "mdName",
-		a.material_code AS "materialCode",
-		a.material_description AS "materialDescription",
-		a.extension_description AS "extensionDescription",
-		a.md_units AS "mdUnits",
-		a.md_count AS "mdCount",
-		a.md_single_weight AS "mdSingleWeight",
-		a.md_total_weight AS "mdTotalWeight",
-		a.md_the_party AS "mdTheParty",
-		a.md_text AS "mdText",
-		a.md_total_amount AS "mdTotalAmount",
-		a.block_id AS "blockId"
-		from md_module_listing as a
-		where block_id in
-		<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
-			#{item}
-		</foreach>
-		order by material_code
-	</select>
+    <select id="exportListing" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ExportListing">
+        select
+        a.md_big_class AS "mdBigClass",
+        a.md_the_class AS "mdTheClass",
+        a.md_name AS "mdName",
+        a.material_code AS "materialCode",
+        a.material_description AS "materialDescription",
+        a.extension_description AS "extensionDescription",
+        a.md_units AS "mdUnits",
+        a.md_count AS "mdCount",
+        a.md_single_weight AS "mdSingleWeight",
+        a.md_total_weight AS "mdTotalWeight",
+        a.md_the_party AS "mdTheParty",
+        a.md_text AS "mdText",
+        a.md_total_amount AS "mdTotalAmount",
+        a.block_id AS "blockId"
+        from md_module_listing as a
+        where block_id in
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        order by material_code
+    </select>
 
-	<select id="findMdImg" resultType="com.jeeplus.modules.sg.picking.activiti.entity.PickIng">
+    <select id="findMdImg" resultType="com.jeeplus.modules.sg.picking.activiti.entity.PickIng">
 		select md_img as mdImg from md_module_block where id =  #{id};
 	</select>
 </mapper>