Commit cd104f46 authored by m1991's avatar m1991

Merge remote-tracking branch 'origin/master'

parents 9b2f6770 126db1de
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.MonthManure;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author 86187
*/
public interface MonthManureMapper extends BaseMapper<MonthManure> {
/**
* 添加月度肥料
*
* @param monthManure 月度肥料信息
* @return 1
*/
int add(MonthManure monthManure);
/**
* 编辑月度肥料
*
* @param monthManure 月度肥料信息
* @return 1
*/
int edit(MonthManure monthManure);
}
......@@ -107,7 +107,6 @@ public interface UsersMapper extends BaseMapper<User> {
User edit1(int userLevel, String intiveCode,String userId);
Integer edit2(User user);
Integer getuserIdById(@Param("userId")String userId);
Integer BYQMById(@Param("userId")String userId);
/**
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.MonthManureMapper">
<resultMap id="monthMap" type="cn.wisenergy.model.app.MonthManure">
<id column="id" property="id"/>
<result column="year_month" property="yearMonth"/>
<result column="manure_award" property="manureAward"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
month_manure
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
year_month,manure_award,create_time,update_time
</sql>
<sql id="vals">
#{yearMonth},#{manureAward},now(),now()
</sql>
<sql id="updateCondition">
<if test="yearMonth != null">year_month =#{yearMonth},</if>
<if test="manureAward != null">manure_award = #{manureAward},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="yearMonth != null">and year_month =#{yearMonth}</if>
<if test="manureAward != null">and manure_award = #{manureAward}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.MonthManure" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value(
<include refid="vals"/>
)
</insert>
<update id="edit" parameterType="cn.wisenergy.model.app.MonthManure">
UPDATE
<include refid="table"/>
<set>
<include refid="updateCondition"/>
</set>
<where>
id = #{id}
</where>
</update>
</mapper>
\ No newline at end of file
......@@ -101,11 +101,13 @@
from
<include refid="table"/>
<where>
be_invited_code=1
<if test="createTime != null">
YEAR(create_time) = YEAR(#{createTime})
AND MONTH(create_time) = MONTH(#{createTime})
and(YEAR(create_time) = YEAR(#{createTime})
AND MONTH(create_time) = MONTH(#{createTime}))
</if>
</where>
order by create_time desc
</select>
<select id="getByUserId" resultType="cn.wisenergy.model.app.User">
......@@ -310,17 +312,5 @@
</where>
</select>
<update id="updateByUserid">
update
<include refid="table"/>
set
(user_level,invite_code,)
value
(#{userLevel},#{inviteCode})
<where>
user_id=#{userId}
</where>
</update>
</mapper>
package cn.wisenergy.model.app;
import lombok.Data;
import java.util.Date;
/**
*@ Description: 月度肥料实体类
*@ Author : 86187
*@ Date : 2021/3/10 10:05
* @author 86187
*/
@Data
public class MonthManure {
/**
* 主键id
*/
private Integer id;
/**
* 年月
*/
private String yearMonth;
/**
* 月度肥料余额
*/
private Double manureAward;
private Date createTime;
private Date updateTime;
}
......@@ -57,7 +57,19 @@ public interface UserService {
*/
R<AerialDeliveryVo> queryAerialDelivery();
/**
* 设置用户头像
* @param userId 用户id
* @param headImage 头像图片地址
* @return true or false
*/
R<Boolean> setHeadImage(String userId, String headImage);
/**
* 设置页面 -邀请码填写
* @param userId 用户id
* @param inviteCode 邀请人邀请码
* @return true or false
*/
R<Boolean> fillInInviteCode(String userId, String inviteCode);
}
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