合并代码
This commit is contained in:
parent
4b7ab6ee90
commit
dda2589474
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.controller;
|
||||
|
||||
import com.bonus.core.basic.model.BasicsCanteenEvaluate;
|
||||
import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
|
||||
import com.bonus.core.basic.service.BasicsCanteenEvaluateService;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.controller;
|
||||
|
||||
import com.bonus.core.basic.model.BasicsComplaint;
|
||||
import com.bonus.core.basic.domain.BasicsComplaint;
|
||||
import com.bonus.core.basic.service.BasicsComplaintService;
|
||||
import com.bonus.common.core.web.controller.BaseController;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.controller;
|
||||
|
||||
import com.bonus.core.basic.model.SysNotice;
|
||||
import com.bonus.core.basic.domain.SysNotice;
|
||||
import com.bonus.core.basic.service.ISysNoticeService;
|
||||
import com.bonus.common.core.web.controller.BaseController;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.bonus.core.basic.model;
|
||||
package com.bonus.core.basic.domain;
|
||||
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.bonus.core.basic.model;
|
||||
package com.bonus.core.basic.domain;
|
||||
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.bonus.core.basic.model;
|
||||
package com.bonus.core.basic.domain;
|
||||
|
||||
import com.bonus.common.core.web.domain.BaseEntity;
|
||||
import com.bonus.common.core.xss.Xss;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.bonus.core.basic.dto;
|
||||
package com.bonus.core.basic.domain.dto;
|
||||
|
||||
import cn.hutool.db.Page;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
package com.bonus.core.basic.dto;
|
||||
package com.bonus.core.basic.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
package com.bonus.core.basic.dto;
|
||||
package com.bonus.core.basic.domain.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.bonus.core.basic.vo;
|
||||
package com.bonus.core.basic.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package com.bonus.core.basic.vo;
|
||||
package com.bonus.core.basic.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.mapper;
|
||||
|
||||
import com.bonus.core.basic.model.BasicsCanteenEvaluate;
|
||||
import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.mapper;
|
||||
|
||||
import com.bonus.core.basic.model.BasicsComplaint;
|
||||
import com.bonus.core.basic.domain.BasicsComplaint;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.bonus.core.basic.mapper;
|
||||
|
||||
|
||||
import com.bonus.core.basic.model.SysNotice;
|
||||
import com.bonus.core.basic.domain.SysNotice;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.service;
|
||||
|
||||
import com.bonus.core.basic.model.BasicsCanteenEvaluate;
|
||||
import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.PageRequest;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.service;
|
||||
|
||||
import com.bonus.core.basic.model.BasicsComplaint;
|
||||
import com.bonus.core.basic.domain.BasicsComplaint;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.bonus.core.basic.service;
|
||||
|
||||
|
||||
import com.bonus.core.basic.model.SysNotice;
|
||||
import com.bonus.core.basic.domain.SysNotice;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ package com.bonus.core.basic.service;
|
|||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
|
||||
import com.bonus.core.basic.dto.MgrUserLoginDTO;
|
||||
import com.bonus.core.basic.dto.PigxUser;
|
||||
import com.bonus.core.basic.domain.dto.MgrUserLoginDTO;
|
||||
import com.bonus.core.basic.domain.dto.PigxUser;
|
||||
import com.bonus.core.common.utils.CustomBusiness;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package com.bonus.core.basic.service.impl;
|
|||
|
||||
import com.bonus.core.common.utils.StringUtils;
|
||||
import com.bonus.core.basic.mapper.BasicsCanteenEvaluateMapper;
|
||||
import com.bonus.core.basic.model.BasicsCanteenEvaluate;
|
||||
import com.bonus.core.basic.domain.BasicsCanteenEvaluate;
|
||||
import com.bonus.core.basic.service.BasicsCanteenEvaluateService;
|
||||
import com.bonus.common.security.utils.SecurityUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.bonus.core.basic.service.impl;
|
||||
|
||||
import com.bonus.core.common.utils.StringUtils;
|
||||
import com.bonus.core.basic.model.BasicsComplaint;
|
||||
import com.bonus.core.basic.domain.BasicsComplaint;
|
||||
import com.bonus.core.basic.mapper.BasicsComplaintMapper;
|
||||
import com.bonus.core.basic.service.BasicsComplaintService;
|
||||
import com.bonus.common.security.utils.SecurityUtils;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.basic.service.impl;
|
||||
import com.bonus.core.basic.mapper.SysNoticeMapper;
|
||||
import com.bonus.core.basic.model.SysNotice;
|
||||
import com.bonus.core.basic.domain.SysNotice;
|
||||
import com.bonus.core.basic.service.ISysNoticeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.common.response;
|
||||
|
||||
import com.bonus.core.basic.vo.Canteen;
|
||||
import com.bonus.core.basic.domain.vo.Canteen;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.bonus.core.common.response;
|
||||
|
||||
import com.bonus.core.basic.vo.Shopstall;
|
||||
import com.bonus.core.basic.domain.vo.Shopstall;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.bonus.core.customer.controller;
|
||||
|
||||
import com.bonus.core.basic.vo.Canteen;
|
||||
import com.bonus.core.basic.vo.Shopstall;
|
||||
import com.bonus.core.basic.domain.vo.Canteen;
|
||||
import com.bonus.core.basic.domain.vo.Shopstall;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import com.bonus.core.customer.domain.MyiInfoReq;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.core.consumer.mapper.BasicsCanteenEvaluateMapper">
|
||||
|
||||
<resultMap type="com.bonus.core.basic.model.BasicsCanteenEvaluate" id="BasicsCanteenEvaluateMap">
|
||||
<resultMap type="com.bonus.core.basic.domain.BasicsCanteenEvaluate" id="BasicsCanteenEvaluateMap">
|
||||
<result property="id" column="id" jdbcType="INTEGER"/>
|
||||
<result property="evaluateId" column="evaluate_id" jdbcType="INTEGER"/>
|
||||
<result property="custId" column="cust_id" jdbcType="INTEGER"/>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.core.consumer.mapper.BasicsComplaintMapper">
|
||||
|
||||
<resultMap type="com.bonus.core.basic.model.BasicsComplaint" id="BasicsComplaintMap">
|
||||
<resultMap type="com.bonus.core.basic.domain.BasicsComplaint" id="BasicsComplaintMap">
|
||||
<result property="id" column="id" jdbcType="INTEGER"/>
|
||||
<result property="complaintId" column="complaint_id" jdbcType="INTEGER"/>
|
||||
<result property="custId" column="cust_id" jdbcType="INTEGER"/>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.core.consumer.mapper.SysNoticeMapper">
|
||||
|
||||
<resultMap type="com.bonus.core.basic.model.SysNotice" id="SysNoticeResult">
|
||||
<resultMap type="com.bonus.core.basic.domain.SysNotice" id="SysNoticeResult">
|
||||
<result property="noticeId" column="notice_id" />
|
||||
<result property="noticeTitle" column="notice_title" />
|
||||
<result property="noticeType" column="notice_type" />
|
||||
|
|
@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
where notice_id = #{noticeId}
|
||||
</select>
|
||||
|
||||
<select id="selectNoticeList" parameterType="com.bonus.core.basic.model.SysNotice" resultMap="SysNoticeResult">
|
||||
<select id="selectNoticeList" parameterType="com.bonus.core.basic.domain.SysNotice" resultMap="SysNoticeResult">
|
||||
<include refid="selectNoticeVo"/>
|
||||
<where>
|
||||
<if test="noticeTitle != null and noticeTitle != ''">
|
||||
|
|
@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</where>
|
||||
</select>
|
||||
|
||||
<insert id="insertNotice" parameterType="com.bonus.core.basic.model.SysNotice">
|
||||
<insert id="insertNotice" parameterType="com.bonus.core.basic.domain.SysNotice">
|
||||
insert into sys_notice (
|
||||
<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
|
||||
<if test="noticeType != null and noticeType != '' ">notice_type, </if>
|
||||
|
|
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
)
|
||||
</insert>
|
||||
|
||||
<update id="updateNotice" parameterType="com.bonus.core.basic.model.SysNotice">
|
||||
<update id="updateNotice" parameterType="com.bonus.core.basic.domain.SysNotice">
|
||||
update sys_notice
|
||||
<set>
|
||||
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
|
||||
|
|
|
|||
Reference in New Issue