Skip to content

H
haoban-manage3.0
Commit c948826b by qwmqiuwenmin
Options

Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

parents 8693a18a 83861ed1
Showing with 68 additions and 56 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaidianDictPageDTO.java
...@@ -17,12 +17,42 @@ public class MaidianDictPageDTO implements Serializable { ...@@ -17,12 +17,42 @@ public class MaidianDictPageDTO implements Serializable {
private String operationPerson; private String operationPerson;
private Integer hideFlag;
private String code;
private String moduleData;
private List<MaidianDictDTO> pageList; private List<MaidianDictDTO> pageList;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public List<MaidianDictDTO> getPageList() { public Integer getHideFlag() {
return hideFlag;
}
public void setHideFlag(Integer hideFlag) {
this.hideFlag = hideFlag;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getModuleData() {
return moduleData;
}
public void setModuleData(String moduleData) {
this.moduleData = moduleData;
}
public List<MaidianDictDTO> getPageList() {
return pageList; return pageList;
} }
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
...@@ -21,7 +21,7 @@ public interface MemberUnionidRelatedApiService { ...@@ -21,7 +21,7 @@ public interface MemberUnionidRelatedApiService {
List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId); List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
List<MemberUnionidRelatedDTO> listByWxEnterpriseIdAndDate(String wxEnterpriseId,Date date); List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId,Date date);
List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId); List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java
...@@ -32,7 +32,7 @@ public interface MemberUnionidRelatedMapper { ...@@ -32,7 +32,7 @@ public interface MemberUnionidRelatedMapper {
List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId); List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
List<MemberUnionidRelated> listByWxEnterpriseIdAndDate(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("date")Date date); List<MemberUnionidRelated> listByEnterpriseIdAndDate(@Param("enterpriseId")String enterpriseId,@Param("date")Date date);
MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("enterpriseId")String enterpriseId, MemberUnionidRelated getByParams(@Param("wxUserId")String wxUserId, @Param("enterpriseId")String enterpriseId,
@Param("externalName")String name, @Param("addCreateTime")String createTime); @Param("externalName")String name, @Param("addCreateTime")String createTime);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaidianDictModuleMapper.java
...@@ -15,9 +15,8 @@ public interface TabHaobanMaidianDictModuleMapper { ...@@ -15,9 +15,8 @@ public interface TabHaobanMaidianDictModuleMapper {
int updateByPrimaryKeySelective(TabHaobanMaidianDictModule record); int updateByPrimaryKeySelective(TabHaobanMaidianDictModule record);
int updateByPrimaryKeyWithBLOBs(TabHaobanMaidianDictModule record);
int updateByPrimaryKey(TabHaobanMaidianDictModule record); int updateByPrimaryKey(TabHaobanMaidianDictModule record);
List<TabHaobanMaidianDictModule> list(); List<TabHaobanMaidianDictModule> list();
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanMaidianDictModule.java
...@@ -16,12 +16,12 @@ public class TabHaobanMaidianDictModule implements Serializable { ...@@ -16,12 +16,12 @@ public class TabHaobanMaidianDictModule implements Serializable {
private String operationPerson; private String operationPerson;
private String moduleData;
private Integer hideFlag; private Integer hideFlag;
private String code; private String code;
private String moduleData;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public String getModuleId() { public String getModuleId() {
...@@ -72,6 +72,14 @@ public class TabHaobanMaidianDictModule implements Serializable { ...@@ -72,6 +72,14 @@ public class TabHaobanMaidianDictModule implements Serializable {
this.operationPerson = operationPerson == null ? null : operationPerson.trim(); this.operationPerson = operationPerson == null ? null : operationPerson.trim();
} }
public String getModuleData() {
return moduleData;
}
public void setModuleData(String moduleData) {
this.moduleData = moduleData == null ? null : moduleData.trim();
}
public Integer getHideFlag() { public Integer getHideFlag() {
return hideFlag; return hideFlag;
} }
...@@ -87,12 +95,4 @@ public class TabHaobanMaidianDictModule implements Serializable { ...@@ -87,12 +95,4 @@ public class TabHaobanMaidianDictModule implements Serializable {
public void setCode(String code) { public void setCode(String code) {
this.code = code == null ? null : code.trim(); this.code = code == null ? null : code.trim();
} }
public String getModuleData() {
return moduleData;
}
public void setModuleData(String moduleData) {
this.moduleData = moduleData == null ? null : moduleData.trim();
}
} }
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
...@@ -636,8 +636,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -636,8 +636,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
return list; return list;
} }
@Override @Override
public List<MemberUnionidRelatedDTO> listByWxEnterpriseIdAndDate( String wxEnterpriseId,Date date) { public List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate( String enterpriseId,Date date) {
List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByWxEnterpriseIdAndDate(wxEnterpriseId,date); List<MemberUnionidRelated> list = memberUnionidRelatedMapper.listByEnterpriseIdAndDate(enterpriseId,date);
return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class,list); return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class,list);
} }
......
haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml
...@@ -230,12 +230,12 @@ ...@@ -230,12 +230,12 @@
and status_flag = 1 and status_flag = 1
and wx_enterprise_id = #{wxEnterpriseId} and wx_enterprise_id = #{wxEnterpriseId}
</select> </select>
<select id="listByWxEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" > <select id="listByEnterpriseIdAndDate" resultMap="BaseResultMap" parameterType="java.lang.String" >
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from tab_haoban_member_unionid_related from tab_haoban_member_unionid_related
where status_flag = 1 where status_flag = 1
and wx_enterprise_id = #{wxEnterpriseId} and enterprise_id = #{enterpriseId}
<if test="date != null" > <if test="date != null" >
and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP}) and TO_DAYS(create_time) <![CDATA[ >= ]]> TO_DAYS(#{date,jdbcType=TIMESTAMP})
</if> </if>
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanMaidianDictModuleMapper.xml
...@@ -8,24 +8,17 @@ ...@@ -8,24 +8,17 @@
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" /> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="status" property="status" jdbcType="INTEGER" /> <result column="status" property="status" jdbcType="INTEGER" />
<result column="operation_person" property="operationPerson" jdbcType="VARCHAR" /> <result column="operation_person" property="operationPerson" jdbcType="VARCHAR" />
<result column="module_data" property="moduleData" jdbcType="VARCHAR" />
<result column="hide_flag" property="hideFlag" jdbcType="INTEGER" /> <result column="hide_flag" property="hideFlag" jdbcType="INTEGER" />
<result column="code" property="code" jdbcType="VARCHAR" /> <result column="code" property="code" jdbcType="VARCHAR" />
</resultMap> </resultMap>
<resultMap id="ResultMapWithBLOBs" type="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" extends="BaseResultMap" >
<result column="module_data" property="moduleData" jdbcType="LONGVARCHAR" />
</resultMap>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
module_id, module_name, create_time, update_time, status, operation_person, hide_flag, module_id, module_name, create_time, update_time, status, operation_person, module_data,
code hide_flag, code
</sql>
<sql id="Blob_Column_List" >
module_data
</sql> </sql>
<select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String" > <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
from tab_haoban_maidian_dict_module from tab_haoban_maidian_dict_module
where module_id = #{moduleId,jdbcType=VARCHAR} where module_id = #{moduleId,jdbcType=VARCHAR}
</select> </select>
...@@ -36,11 +29,11 @@ ...@@ -36,11 +29,11 @@
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
insert into tab_haoban_maidian_dict_module (module_id, module_name, create_time, insert into tab_haoban_maidian_dict_module (module_id, module_name, create_time,
update_time, status, operation_person, update_time, status, operation_person,
hide_flag, code, module_data module_data, hide_flag, code
) )
values (#{moduleId,jdbcType=VARCHAR}, #{moduleName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, values (#{moduleId,jdbcType=VARCHAR}, #{moduleName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{operationPerson,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, #{operationPerson,jdbcType=VARCHAR},
#{hideFlag,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{moduleData,jdbcType=LONGVARCHAR} #{moduleData,jdbcType=VARCHAR}, #{hideFlag,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
...@@ -64,15 +57,15 @@ ...@@ -64,15 +57,15 @@
<if test="operationPerson != null" > <if test="operationPerson != null" >
operation_person, operation_person,
</if> </if>
<if test="moduleData != null" >
module_data,
</if>
<if test="hideFlag != null" > <if test="hideFlag != null" >
hide_flag, hide_flag,
</if> </if>
<if test="code != null" > <if test="code != null" >
code, code,
</if> </if>
<if test="moduleData != null" >
module_data,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="moduleId != null" > <if test="moduleId != null" >
...@@ -93,15 +86,15 @@ ...@@ -93,15 +86,15 @@
<if test="operationPerson != null" > <if test="operationPerson != null" >
#{operationPerson,jdbcType=VARCHAR}, #{operationPerson,jdbcType=VARCHAR},
</if> </if>
<if test="moduleData != null" >
#{moduleData,jdbcType=VARCHAR},
</if>
<if test="hideFlag != null" > <if test="hideFlag != null" >
#{hideFlag,jdbcType=INTEGER}, #{hideFlag,jdbcType=INTEGER},
</if> </if>
<if test="code != null" > <if test="code != null" >
#{code,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR},
</if> </if>
<if test="moduleData != null" >
#{moduleData,jdbcType=LONGVARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
...@@ -122,30 +115,18 @@ ...@@ -122,30 +115,18 @@
<if test="operationPerson != null" > <if test="operationPerson != null" >
operation_person = #{operationPerson,jdbcType=VARCHAR}, operation_person = #{operationPerson,jdbcType=VARCHAR},
</if> </if>
<if test="moduleData != null" >
module_data = #{moduleData,jdbcType=VARCHAR},
</if>
<if test="hideFlag != null" > <if test="hideFlag != null" >
hide_flag = #{hideFlag,jdbcType=INTEGER}, hide_flag = #{hideFlag,jdbcType=INTEGER},
</if> </if>
<if test="code != null" > <if test="code != null" >
code = #{code,jdbcType=VARCHAR}, code = #{code,jdbcType=VARCHAR},
</if> </if>
<if test="moduleData != null" >
module_data = #{moduleData,jdbcType=LONGVARCHAR},
</if>
</set> </set>
where module_id = #{moduleId,jdbcType=VARCHAR} where module_id = #{moduleId,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
update tab_haoban_maidian_dict_module
set module_name = #{moduleName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
operation_person = #{operationPerson,jdbcType=VARCHAR},
hide_flag = #{hideFlag,jdbcType=INTEGER},
code = #{code,jdbcType=VARCHAR},
module_data = #{moduleData,jdbcType=LONGVARCHAR}
where module_id = #{moduleId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" > <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.TabHaobanMaidianDictModule" >
update tab_haoban_maidian_dict_module update tab_haoban_maidian_dict_module
set module_name = #{moduleName,jdbcType=VARCHAR}, set module_name = #{moduleName,jdbcType=VARCHAR},
...@@ -153,12 +134,12 @@ ...@@ -153,12 +134,12 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}, status = #{status,jdbcType=INTEGER},
operation_person = #{operationPerson,jdbcType=VARCHAR}, operation_person = #{operationPerson,jdbcType=VARCHAR},
module_data = #{moduleData,jdbcType=VARCHAR},
hide_flag = #{hideFlag,jdbcType=INTEGER}, hide_flag = #{hideFlag,jdbcType=INTEGER},
code = #{code,jdbcType=VARCHAR} code = #{code,jdbcType=VARCHAR}
where module_id = #{moduleId,jdbcType=VARCHAR} where module_id = #{moduleId,jdbcType=VARCHAR}
</update> </update>
<select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" >
<select id="list" resultMap="BaseResultMap" parameterType="java.lang.String" >
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from tab_haoban_maidian_dict_module from tab_haoban_maidian_dict_module
...@@ -166,4 +147,5 @@ ...@@ -166,4 +147,5 @@
order by create_time order by create_time
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment