Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/DataMaintenanceMapper.java

@@ -14,4 +14,5 @@ import java.util.List;
 @MyBatisMapper
 public interface DataMaintenanceMapper extends BaseMapper<MaintainData> {
 	int insertList(@Param("list") List<MaintainData> list);
+	void deleteData(String projectId);
 }

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DataMaintenanceMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.jeeplus.modules.sg.financial.settlement.mapper.DataMaintenanceMapper">
     
 	<sql id="infoColumns">
-		a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -11,6 +10,11 @@
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
 		a.project_id AS "projectId",
+		a.design_units AS "designUnits",
+		a.construction_units AS "constructionUnits",
+		a.address,
+		a.property,
+		a.investment,
 		a.start_date AS "startDate",
 		a.end_date AS "endDate",
 		a.approval_number AS "approvalNumber",
@@ -26,16 +30,16 @@
 		a.total_fee AS "totalFee"
 	</sql>
 
-
+    
 	<select id="get" resultType="MaintainData" >
-		SELECT
+		SELECT 
 			<include refid="infoColumns"/>
 		FROM js_maintain_data a
-		WHERE a.id = #{id}
+		WHERE a.project_id = #{id}
 	</select>
-
+	
 	<select id="findList" resultType="MaintainData" >
-		SELECT
+		SELECT 
 			<include refid="infoColumns"/>
 		FROM js_maintain_data a
 		<where>
@@ -57,15 +61,15 @@
 			</otherwise>
 		</choose>
 	</select>
-
+	
 	<select id="findAllList" resultType="MaintainData" >
-		SELECT
+		SELECT 
 			<include refid="infoColumns"/>
 		FROM js_maintain_data a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
-		</where>
+		</where>		
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -75,10 +79,10 @@
 			</otherwise>
 		</choose>
 	</select>
-
+	
 	<insert id="insert">
 		INSERT INTO js_maintain_data(
-			id,
+
 			create_by,
 			create_date,
 			update_by,
@@ -86,6 +90,11 @@
 			remarks,
 			del_flag,
 			project_id,
+			design_units,
+		    construction_units,
+		    address,
+		    property,
+		    investment,
 			start_date,
 			end_date,
 			approval_number,
@@ -100,7 +109,7 @@
 			management_fee,
 			total_fee
 		) VALUES (
-			#{id},
+
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -108,6 +117,11 @@
 			#{remarks},
 			#{delFlag},
 			#{projectId},
+			#{designUnits},
+			#{constructionUnits},
+			#{address},
+			#{property},
+			#{investment},
 			#{startDate},
 			#{endDate},
 			#{approvalNumber},
@@ -126,7 +140,6 @@
 
     <insert id="insertList">
         replace INTO js_maintain_data(
-			id,
 			create_by,
 			create_date,
 			update_by,
@@ -134,6 +147,11 @@
 			remarks,
 			del_flag,
 			project_id,
+		    design_units,
+		    construction_units,
+		    address,
+		    property,
+		    investment,
 			start_date,
 			end_date,
 			approval_number,
@@ -150,7 +168,7 @@
 		) VALUES
         <foreach collection="list" item="item" index="index" separator="," >
 		(
-			#{item.id},
+
 			#{item.createBy.id},
 			#{item.createDate},
 			#{item.updateBy.id},
@@ -158,6 +176,11 @@
 			#{item.remarks},
 			#{item.delFlag},
 			#{item.projectId},
+			#{item.designUnits},
+			#{item.constructionUnits},
+			#{item.address},
+			#{item.property},
+			#{item.investment},
 			#{item.startDate},
 			#{item.endDate},
 			#{item.approvalNumber},
@@ -174,14 +197,17 @@
 		)
         </foreach>
 	</insert>
-
+	
 	<update id="update">
 		UPDATE js_maintain_data SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
-			remarks = #{remarks},
+			design_units = #{designUnits},
+			construction_units = #{constructionUnits},
+			address = #{address},
+			property = #{property},
+			investment = #{investment},
 			start_date = #{startDate},
-			project_id = #{projectId},
 			end_date = #{endDate},
 			approval_number = #{approvalNumber},
 			building_fee = #{buildingFee},
@@ -194,21 +220,26 @@
 			damages = #{damages},
 			management_fee = #{managementFee},
 			total_fee = #{totalFee}
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
-
-
+	
+	
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM js_maintain_data
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
 
+	<update id="deleteData">
+		DELETE FROM js_maintain_data
+		WHERE project_id = #{projectId}
+	</update>
+	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
 		UPDATE js_maintain_data SET
 			del_flag = #{DEL_FLAG_DELETE}
-		WHERE id = #{id}
+		WHERE project_id = #{id}
 	</update>
 	
 	
@@ -216,6 +247,5 @@
 	<select id="findUniqueByProperty" resultType="TestNote" statementType="STATEMENT">
 		select * FROM js_maintain_data  where ${propertyName} = '${value}'
 	</select>
-
-
+	
 </mapper>

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/DataMaintenanceController.java

@@ -66,7 +66,8 @@ public class DataMaintenanceController extends BaseController {
 		model.addAttribute("maintainData", maintainData);
 		return "modules/sg/financial/settlement/dataMaintenanceList";
 	}
-	
+
+
 		/**
 	 * 列表数据
 	 */