Browse Source

合并错误修改

dev_shibei_match
jianjun 5 years ago
parent
commit
81abe2e40e
  1. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java
  2. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/IndexGroupDetailDao.java

@ -38,8 +38,6 @@ public interface IndexGroupDetailDao extends BaseDao<IndexGroupDetailEntity> {
List<IndexGroupDetailEntity> getAllIndexWeightList(String customerId);
int updateWeight(@Param("indexCode") String indexCode, @Param("customerId") String customerId, @Param("weight") BigDecimal weight,@Param("allParentIndexCode") String allParentIndexCode);
int deleteByCustomerId(@Param("customerId") String customerId);
/**

10
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailDao.xml

@ -19,16 +19,6 @@
CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and STATUS = 'enable' and DEL_FLAG = '0'
</select>
<update id="updateWeight" parameterType="map">
UPDATE index_group_detail
SET WEIGHT =#{weight},UPDATED_TIME=NOW()
WHERE
DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
AND INDEX_CODE = #{indexCode}
and ALL_PARENT_INDEX_CODE=#{allParentIndexCode}
</update>
<delete id="deleteByCustomerId">
delete from index_group_detail where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
</delete>

Loading…
Cancel
Save