zouxuan пре 5 година
родитељ
комит
b7a2593b37

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SporadicChargeInfo.java

@@ -39,6 +39,17 @@ public class SporadicChargeInfo {
 	@ApiModelProperty(value = "操作人", required = true)
 	private String operatorName;
 
+	@ApiModelProperty(value = "是否删除", required = true)
+	private Integer delFlag;
+
+	public Integer getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Integer delFlag) {
+		this.delFlag = delFlag;
+	}
+
 	public String getOrganName() {
 		return organName;
 	}

+ 5 - 3
mec-biz/src/main/resources/config/mybatis/SporadicChargeInfo.xml

@@ -13,6 +13,7 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="operator_id_" property="operatorId" />
+		<result column="del_flag_" property="delFlag" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -63,9 +64,9 @@
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM sporadic_charge_info WHERE id_ = #{id}
-	</delete>
+	<update id="delete">
+		UPDATE sporadic_charge_info SET del_flag_ = 1 WHERE id_ = #{id}
+	</update>
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SporadicChargeInfo" parameterType="map">
@@ -77,6 +78,7 @@
 
 	<sql id="queryPageSql">
 		<where>
+				sci.del_flag_ != 1
 			<if test="organId != null">
 				AND FIND_IN_SET(sci.organ_id_,#{organId})
 			</if>