Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

食谱模板功能完成

Browse Source
This commit is contained in:
huangdeliang
2021-03-01 19:04:01 +08:00
parent 2d2e68ae10
commit 3d20c30edc
24 changed files with 1118 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlanModel.java → stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesTemplate.java
View File

@ -1,23 +1,32 @@
package com.stdiet.custom.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class SysRecipesPlanModel {
public class SysRecipesTemplate {
Long id;
String name;
Long nutritionistId;
String nutritionist;
Long nutriAssisId;
String nutriAssis;
Long planId;
String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
Date updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
Date createTime;
String updateBy;
@ -25,4 +34,6 @@ public class SysRecipesPlanModel {
String createBy;
Long recipesId;
Integer reviewStatus;
}

24
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanModelMapper.java
View File

@ -1,24 +0,0 @@
package com.stdiet.custom.mapper;
import com.stdiet.custom.domain.SysRecipesPlan;
import com.stdiet.custom.domain.SysRecipesPlanListInfo;
import com.stdiet.custom.domain.SysRecipesPlanModel;
import java.util.List;
/**
* 食谱计划Mapper接口
*
* @author wonder
* @date 2021-02-27
*/
public interface SysRecipesPlanModelMapper
{
List<SysRecipesPlanModel> selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel);
int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel);
int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel);
int removeRecipesModel(Long id);
}

23
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesTemplateMapper.java Normal file
View File

@ -0,0 +1,23 @@
package com.stdiet.custom.mapper;
import com.stdiet.custom.domain.SysRecipesTemplate;
import java.util.List;
/**
* 食谱计划Mapper接口
*
* @author wonder
* @date 2021-02-27
*/
public interface SysRecipesTemplateMapper {
List<SysRecipesTemplate> selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate);
int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate);
int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate);
int removeRecipesTemplate(Long id);
SysRecipesTemplate getRecipesTemplateById(Long id);
}

25
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanModelService.java
View File

@ -1,25 +0,0 @@
package com.stdiet.custom.service;
import com.stdiet.custom.domain.SysRecipesPlan;
import com.stdiet.custom.domain.SysRecipesPlanListInfo;
import com.stdiet.custom.domain.SysRecipesPlanModel;
import java.util.List;
/**
* 食谱计划Service接口
*
* @author wonder
* @date 2021-02-27
*/
public interface ISysRecipesPlanModelService
{
List<SysRecipesPlanModel> selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel);
int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel);
int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel);
int removeRecipesModel(Long id);
}

24
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesTemplateService.java Normal file
View File

@ -0,0 +1,24 @@
package com.stdiet.custom.service;
import com.stdiet.custom.domain.SysRecipesTemplate;
import java.util.List;
/**
* 食谱计划Service接口
*
* @author wonder
* @date 2021-02-27
*/
public interface ISysRecipesTemplateService {
List<SysRecipesTemplate> selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate);
int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate);
int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate);
int removeRecipesTemplate(Long id);
SysRecipesTemplate getRecipesTemplateById(Long id);
}

67
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanModelServiceImpl.java
View File

@ -1,67 +0,0 @@
package com.stdiet.custom.service.impl;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.custom.domain.SysRecipesPlan;
import com.stdiet.custom.domain.SysRecipesPlanModel;
import com.stdiet.custom.mapper.SysRecipesPlanMapper;
import com.stdiet.custom.mapper.SysRecipesPlanModelMapper;
import com.stdiet.custom.service.ISysRecipesPlanModelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
* 食谱计划Service业务层处理
*
* @author wonder
* @date 2021-02-27
*/
@Service("sysRecipesPlanModelService")
@Transactional
public class SysRecipesPlanModelServiceImpl implements ISysRecipesPlanModelService {
@Autowired
SysRecipesPlanModelMapper sysRecipesPlanModelMapper;
@Autowired
SysRecipesPlanMapper sysRecipesPlanMapper;
@Override
public List<SysRecipesPlanModel> selectRecipesModelListByCondition(SysRecipesPlanModel sysRecipesPlanModel) {
return sysRecipesPlanModelMapper.selectRecipesModelListByCondition(sysRecipesPlanModel);
}
@Override
public int insertRecipsesModel(SysRecipesPlanModel sysRecipesPlanModel) {
SysRecipesPlan sysRecipesPlan = new SysRecipesPlan();
sysRecipesPlan.setStartNumDay(1);
sysRecipesPlan.setEndNumDay(7);
sysRecipesPlan.setType(1);
int rows = sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan);
if (rows > 0) {
sysRecipesPlanModel.setCreateBy(SecurityUtils.getUsername());
sysRecipesPlanModel.setCreateTime(DateUtils.getNowDate());
sysRecipesPlanModel.setPlanId(sysRecipesPlan.getId());
return sysRecipesPlanModelMapper.insertRecipsesModel(sysRecipesPlanModel);
}
return 0;
}
@Override
public int updateRecipesModel(SysRecipesPlanModel sysRecipesPlanModel) {
sysRecipesPlanModel.setUpdateBy(SecurityUtils.getUsername());
sysRecipesPlanModel.setUpdateTime(DateUtils.getNowDate());
return sysRecipesPlanModelMapper.updateRecipesModel(sysRecipesPlanModel);
}
@Override
public int removeRecipesModel(Long id) {
return sysRecipesPlanModelMapper.removeRecipesModel(id);
}
}

70
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java Normal file
View File

@ -0,0 +1,70 @@
package com.stdiet.custom.service.impl;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.common.utils.SecurityUtils;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.custom.domain.SysRecipesPlan;
import com.stdiet.custom.domain.SysRecipesTemplate;
import com.stdiet.custom.mapper.SysRecipesPlanMapper;
import com.stdiet.custom.mapper.SysRecipesTemplateMapper;
import com.stdiet.custom.service.ISysRecipesTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 食谱计划Service业务层处理
*
* @author wonder
* @date 2021-02-27
*/
@Service("sysRecipesPlanModelService")
@Transactional
public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService {
@Autowired
SysRecipesTemplateMapper sysRecipesTemplateMapper;
@Autowired
SysRecipesPlanMapper sysRecipesPlanMapper;
@Override
public List<SysRecipesTemplate> selectRecipesTemplateListByCondition(SysRecipesTemplate sysRecipesTemplate) {
return sysRecipesTemplateMapper.selectRecipesTemplateListByCondition(sysRecipesTemplate);
}
@Override
public int insertRecipsesTemplate(SysRecipesTemplate sysRecipesTemplate) {
SysRecipesPlan sysRecipesPlan = new SysRecipesPlan();
sysRecipesPlan.setStartNumDay(1);
sysRecipesPlan.setEndNumDay(7);
sysRecipesPlan.setType(1);
sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan);
if (!StringUtils.isNull(sysRecipesPlan.getId())) {
sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername());
sysRecipesTemplate.setCreateTime(DateUtils.getNowDate());
sysRecipesTemplate.setPlanId(sysRecipesPlan.getId());
return sysRecipesTemplateMapper.insertRecipsesTemplate(sysRecipesTemplate);
}
return 0;
}
@Override
public int updateRecipesTemplate(SysRecipesTemplate sysRecipesTemplate) {
sysRecipesTemplate.setUpdateBy(SecurityUtils.getUsername());
sysRecipesTemplate.setUpdateTime(DateUtils.getNowDate());
return sysRecipesTemplateMapper.updateRecipesTemplate(sysRecipesTemplate);
}
@Override
public int removeRecipesTemplate(Long id) {
return sysRecipesTemplateMapper.removeRecipesTemplate(id);
}
@Override
public SysRecipesTemplate getRecipesTemplateById(Long id) {
return sysRecipesTemplateMapper.getRecipesTemplateById(id);
}
}

6
stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
View File

@ -86,6 +86,7 @@
<if test="updateBy != null">update_by,</if>
<if test="delFlag != null">del_flag,</if>
<if test="reviewStatus != null">review_status,</if>
<if test="type != null">type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
@ -104,6 +105,7 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="reviewStatus != null">#{reviewStatus},</if>
<if test="type != null">#{type},</if>
</trim>
</insert>
@ -163,7 +165,7 @@
<!-- 食谱计划、订单表联查 -->
<select id="selectPlanListByCondition" parameterType="SysRecipesPlan" resultMap="SysRecipesPlanResult">
SELECT srp.id,srp.order_id,srp.recipes_id,srp.start_num_day,srp.end_num_day,srp.cus_id,sc.phone,
su_nutritionist.nick_name nutritionist,su_nutritionist_assis.nick_name AS nutritionist_assis,
su_nutritionist.nick_name AS nutritionist,su_nutritionist_assis.nick_name AS nutritionist_assis,
srp.start_date,srp.end_date,srp.send_flag,srp.send_time, sc.name as customer, srp.review_status
FROM sys_recipes_plan srp
LEFT JOIN sys_order sr ON sr.order_id = srp.order_id
@ -215,7 +217,7 @@
<!-- 根据cusId查询食谱计划-->
<select id="selectPlanListByCusId" parameterType="Long" resultMap="SysRecipesPlanResult">
select id, out_id, start_date, end_date, start_num_day, end_num_day, recipes_id, review_status from sys_recipes_plan
where cus_id=#{cusId} order by create_time desc
where cus_id=#{cusId} order by id desc
</select>
<select id="getCusIdByOutId" parameterType="String" resultType="Long">

75
stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanModelMapper.xml
View File

@ -1,75 +0,0 @@
<?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="com.stdiet.custom.mapper.SysRecipesPlanModelMapper">
<resultMap type="SysRecipesPlanModel" id="SysRecipesModelResult">
<result property="id" column="id"/>
<result property="planId" column="plan_id"/>
<result property="nutritionistId" column="nutritionist_id"/>
<result property="nutriAssisId" column="nutri_assis_id"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="recipesId" column="recipes_id"/>
</resultMap>
<select id="selectRecipesModelListByCondition" parameterType="SysRecipesPlanModel" resultMap="SysRecipesModelResult">
select srpm.id, srpm.nutritionist_id, srpm.nutri_assis_id, srpm.remark, srpm.update_time,
srpm.create_time, srpm.update_by, srpm.create_by, srpm.plan_id, srp.recipes_id, srp.review_status
from sys_recipes_plan_model srpm
left join sys_recipes_plan srp on srp.id = srpm.plan_id
where del_flag = 0
<if test="nutriAssisId != null ">and nutri_assis_id = #{nutriAssisId}</if>
<if test="nutritionistId != null ">and nutritionist_id = #{nutritionistId}</if>
<if test="reviewStatus != null ">and review_status = #{reviewStatus}</if>
order by srpm.create_time desc
</select>
<insert id="insertRecipsesModel" parameterType="SysRecipesPlanModel" useGeneratedKeys="true" keyProperty="id">
insert into sys_recipes_plan_model
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="nutriAssisId != null">nutri_assis_id,</if>
<if test="nutritionistId != null">nutritionist_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="remark != null">remark,</if>
<if test="reviewStatus != null">review_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nutriAssisId != null">#{nutriAssisId},</if>
<if test="nutritionistId != null">#{nutritionistId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="remark != null">#{remark},</if>
<if test="reviewStatus != null">#{reviewStatus},</if>
</trim>
</insert>
<update id="updateRecipesModel" parameterType="SysRecipesPlanModel">
update sys_recipes_plan_model
<trim prefix="SET" suffixOverrides=",">
<if test="nutriAssisId != null">nutri_assis_id = #{nutriAssisId},</if>
<if test="nutritionistId != null">nutritionist_id = #{nutritionistId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="reviewStatus != null">review_status = #{reviewStatus},</if>
</trim>
where id = #{id}
</update>
<delete id="removeRecipesModel" parameterType="Long">
update sys_recipes_plan_model set del_flag=1 where id = #{id}
</delete>
</mapper>

96
stdiet-custom/src/main/resources/mapper/custom/SysRecipesTemplateMapper.xml Normal file
View File

@ -0,0 +1,96 @@
<?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="com.stdiet.custom.mapper.SysRecipesTemplateMapper">
<resultMap type="SysRecipesTemplate" id="SysRecipesTemplateResult">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="planId" column="plan_id"/>
<result property="nutritionistId" column="nutritionist_id"/>
<result property="nutriAssisId" column="nutri_assis_id"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="recipesId" column="recipes_id"/>
<result property="reviewStatus" column="review_status"/>
<result property="nutritionist" column="nutritionist"/>
<result property="nutriAssis" column="nutritionist_assis"/>
</resultMap>
<select id="selectRecipesTemplateListByCondition" parameterType="SysRecipesTemplate" resultMap="SysRecipesTemplateResult">
select srt.id, srt.name, srt.nutritionist_id, srt.nutri_assis_id, srt.remark, srt.update_time,
srt.create_time, srt.update_by, srt.create_by, srt.plan_id, srp.recipes_id, srp.review_status,
su_nutritionist.nick_name as nutritionist, su_nutritionist_assis.nick_name as nutritionist_assis
from sys_recipes_template srt
left join sys_recipes_plan srp on srp.id = srt.plan_id
left join sys_user su_nutritionist on su_nutritionist.user_id = srt.nutritionist_id and su_nutritionist.del_flag = 0
left join sys_user su_nutritionist_assis on su_nutritionist_assis.user_id = srt.nutri_assis_id and su_nutritionist_assis.del_flag = 0
where srt.del_flag = 0
<if test="name != null and name != ''">and srt.name like concat('%', #{name}, '%')</if>
<if test="nutriAssisId != null ">and srt.nutri_assis_id = #{nutriAssisId}</if>
<if test="nutritionistId != null ">and srt.nutritionist_id = #{nutritionistId}</if>
<if test="reviewStatus != null ">and srp.review_status = #{reviewStatus}</if>
order by srt.id desc
</select>
<select id="getRecipesTemplateById" parameterType="Long" resultType="SysRecipesTemplate">
select srt.id, srt.name, srt.nutritionist_id as nutritionistId, srt.nutri_assis_id as nutriAssisId, srt.remark, srt.update_time as updateTime,
srt.create_time as createTime, srt.update_by as updateBy, srt.create_by as createBy, srt.plan_id as planId,
su_nutritionist.nick_name as nutritionist, su_nutritionist_assis.nick_name as nutriAssis
from sys_recipes_template srt
left join sys_user su_nutritionist on su_nutritionist.user_id = srt.nutritionist_id and su_nutritionist.del_flag = 0
left join sys_user su_nutritionist_assis on su_nutritionist_assis.user_id = srt.nutri_assis_id and su_nutritionist_assis.del_flag = 0
where srt.id = #{id} and srt.del_flag = 0
</select>
<insert id="insertRecipsesTemplate" parameterType="SysRecipesTemplate" useGeneratedKeys="true" keyProperty="id">
insert into sys_recipes_template
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="planId != null">plan_id,</if>
<if test="nutriAssisId != null">nutri_assis_id,</if>
<if test="nutritionistId != null">nutritionist_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="planId != null">#{planId},</if>
<if test="nutriAssisId != null">#{nutriAssisId},</if>
<if test="nutritionistId != null">#{nutritionistId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateRecipesTemplate" parameterType="SysRecipesTemplate">
update sys_recipes_template
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="nutriAssisId != null">nutri_assis_id = #{nutriAssisId},</if>
<if test="nutritionistId != null">nutritionist_id = #{nutritionistId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="removeRecipesTemplate" parameterType="Long">
update sys_recipes_template set del_flag=1 where id = #{id}
</delete>
</mapper>