zhenghaiyang@ele-cloud.com
2 years ago
committed by
WangQi
parent
70bec932da
commit
1abd3eed6d
@ -0,0 +1,64 @@ |
||||
package com.dxhy.order.baseservice.module.thirdservice.user.dto; |
||||
|
||||
import lombok.AllArgsConstructor; |
||||
import lombok.Builder; |
||||
import lombok.Data; |
||||
import lombok.NoArgsConstructor; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.List; |
||||
|
||||
|
||||
/** |
||||
* 增加用户dto |
||||
* 与AdminUserOperateDto一致 |
||||
*/ |
||||
@Data |
||||
@NoArgsConstructor |
||||
@AllArgsConstructor |
||||
@Builder |
||||
public class AddUserRequestDto implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
|
||||
/** |
||||
* 用户id |
||||
*/ |
||||
private Long userId; |
||||
/** |
||||
* 登陆人id |
||||
*/ |
||||
private Long puserId; |
||||
/** |
||||
* 用户名 |
||||
*/ |
||||
private String username; |
||||
/** |
||||
* 姓名 |
||||
*/ |
||||
private String name; |
||||
/** |
||||
* 密码 |
||||
*/ |
||||
private String password; |
||||
/** |
||||
* 手机号 |
||||
*/ |
||||
private String mobile; |
||||
/** |
||||
* 部门ID |
||||
*/ |
||||
private Long deptId; |
||||
/** |
||||
* 看板权限 |
||||
*/ |
||||
private Integer boradAuth; |
||||
/** |
||||
* 角色id |
||||
*/ |
||||
private List<Long> roleIdList; |
||||
/** |
||||
* 数据权限id |
||||
*/ |
||||
private List<Long> deptList; |
||||
} |
||||
@ -0,0 +1,23 @@ |
||||
package com.dxhy.order.consumer.dao; |
||||
|
||||
import com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet; |
||||
|
||||
import java.util.List; |
||||
|
||||
public interface InvoiceRemarkSetMapper { |
||||
int deleteByPrimaryKey(String id); |
||||
|
||||
int deleteByGsbm(String gsbm); |
||||
|
||||
int insert(InvoiceRemarkSet record); |
||||
|
||||
int insertSelective(InvoiceRemarkSet record); |
||||
|
||||
InvoiceRemarkSet selectByPrimaryKey(String id); |
||||
|
||||
List<InvoiceRemarkSet> selectRemarkSetList(InvoiceRemarkSet record); |
||||
|
||||
int updateByPrimaryKeySelective(InvoiceRemarkSet record); |
||||
|
||||
int updateByPrimaryKey(InvoiceRemarkSet record); |
||||
} |
||||
@ -1,22 +0,0 @@ |
||||
package com.dxhy.order.consumer.model.page; |
||||
|
||||
import lombok.Getter; |
||||
import lombok.Setter; |
||||
|
||||
/** |
||||
* 页面查询用户信息 请求参数bean |
||||
* @author: <a href="yaoxuguang@ele-cloud.com">yaoxuguang</a> |
||||
* @createDate: Created in 2023-01-06 |
||||
*/ |
||||
@Getter |
||||
@Setter |
||||
public class PageUserInfoReq { |
||||
/** |
||||
* 用户token |
||||
*/ |
||||
private String userToken; |
||||
/** |
||||
* 查询类型 |
||||
*/ |
||||
private String type; |
||||
} |
||||
@ -0,0 +1,50 @@ |
||||
package com.dxhy.order.consumer.modules.order.controller; |
||||
|
||||
import com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet; |
||||
import com.dxhy.order.consumer.modules.order.model.vo.InvoiceRemarkSetVo; |
||||
import com.dxhy.order.consumer.modules.order.service.InvoiceRemarkSetService; |
||||
import com.dxhy.order.model.R; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import javax.annotation.Resource; |
||||
|
||||
/** |
||||
* @Description: 发票备注设置 |
||||
* @Author liufeilong |
||||
* @Date 2023-03-02 |
||||
**/ |
||||
@Slf4j |
||||
@RestController |
||||
@RequestMapping(value = "/invoiceRemarkSet") |
||||
public class InvoiceRemarkSetController { |
||||
|
||||
private static final String LOGGER_MSG = "(发票备注设置)"; |
||||
|
||||
@Resource |
||||
private InvoiceRemarkSetService invoiceRemarkSetService; |
||||
|
||||
/** |
||||
* 获取公司下的发票备注模板 |
||||
* @return |
||||
*/ |
||||
@PostMapping("/queryRemarkSet") |
||||
public R queryRemarkSet(@RequestBody InvoiceRemarkSet invoiceRemarkSet) { |
||||
return R.ok().put("data", invoiceRemarkSetService.queryRemarkSet(invoiceRemarkSet)); |
||||
} |
||||
|
||||
/** |
||||
* 保存发票备注模板 |
||||
* @return |
||||
*/ |
||||
@PostMapping("/saveRemarkSet") |
||||
public R saveRemarkSet(@RequestBody InvoiceRemarkSetVo invoiceRemarkSetVo) { |
||||
return invoiceRemarkSetService.saveRemarkSet(invoiceRemarkSetVo); |
||||
} |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,26 @@ |
||||
package com.dxhy.order.consumer.modules.order.model; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class InvoiceRemarkSet { |
||||
private String id; |
||||
|
||||
private String xhfNsrsbh; |
||||
|
||||
private String gsbm; |
||||
|
||||
private String xh; |
||||
|
||||
private String mbmc; |
||||
|
||||
private String mbnr; |
||||
|
||||
private String status; |
||||
|
||||
private Date createTime; |
||||
|
||||
private String credateUserId; |
||||
} |
||||
@ -0,0 +1,18 @@ |
||||
package com.dxhy.order.consumer.modules.order.model.vo; |
||||
|
||||
import com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet; |
||||
import lombok.Data; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @Description: 页面保存备注设置实体 |
||||
* @Author liufeilong |
||||
* @Date 2023-03-03 |
||||
**/ |
||||
@Data |
||||
public class InvoiceRemarkSetVo { |
||||
private String xhfNsrsbh; |
||||
private String gsbm; |
||||
private List<InvoiceRemarkSet> list; |
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
package com.dxhy.order.consumer.modules.order.service; |
||||
|
||||
import com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet; |
||||
import com.dxhy.order.consumer.modules.order.model.vo.InvoiceRemarkSetVo; |
||||
import com.dxhy.order.model.R; |
||||
|
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* @Description: 发票备注设置 |
||||
* @Author liufeilong |
||||
* @Date 2023-03-02 |
||||
**/ |
||||
public interface InvoiceRemarkSetService { |
||||
|
||||
List<InvoiceRemarkSet> queryRemarkSet(InvoiceRemarkSet invoiceRemarkSet); |
||||
|
||||
R saveRemarkSet(InvoiceRemarkSetVo invoiceRemarkSetVo); |
||||
} |
||||
@ -0,0 +1,70 @@ |
||||
package com.dxhy.order.consumer.modules.order.service.impl; |
||||
|
||||
import com.dxhy.order.baseservice.module.base.service.BaseService; |
||||
import com.dxhy.order.baseservice.module.thirdservice.user.model.UserEntity; |
||||
import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; |
||||
import com.dxhy.order.consumer.dao.InvoiceRemarkSetMapper; |
||||
import com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet; |
||||
import com.dxhy.order.consumer.modules.order.model.vo.InvoiceRemarkSetVo; |
||||
import com.dxhy.order.consumer.modules.order.service.InvoiceRemarkSetService; |
||||
import com.dxhy.order.model.R; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.transaction.annotation.Transactional; |
||||
|
||||
import javax.annotation.Resource; |
||||
import java.util.Date; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* @Description: 发票备注设置 |
||||
* @Author liufeilong |
||||
* @Date 2023-03-02 |
||||
**/ |
||||
@Slf4j |
||||
@Service |
||||
public class InvoiceRemarkSetServiceImpl implements InvoiceRemarkSetService { |
||||
|
||||
@Resource |
||||
private InvoiceRemarkSetMapper invoiceRemarkSetMapper; |
||||
@Resource |
||||
private BaseService baseService; |
||||
@Resource |
||||
private UserInfoService userInfoService; |
||||
|
||||
@Override |
||||
public List<InvoiceRemarkSet> queryRemarkSet(InvoiceRemarkSet invoiceRemarkSet) { |
||||
return invoiceRemarkSetMapper.selectRemarkSetList(invoiceRemarkSet); |
||||
} |
||||
|
||||
@Override |
||||
@Transactional |
||||
public R saveRemarkSet(InvoiceRemarkSetVo invoiceRemarkSetVo) { |
||||
UserEntity user = userInfoService.getUser(); |
||||
String gsbm = invoiceRemarkSetVo.getGsbm(); |
||||
String xhfNsrsbh = invoiceRemarkSetVo.getXhfNsrsbh(); |
||||
List<InvoiceRemarkSet> invoiceRemarkSetList = invoiceRemarkSetVo.getList(); |
||||
if(invoiceRemarkSetList.size()>0){ |
||||
String mbmc = invoiceRemarkSetList.get(0).getMbmc(); |
||||
for(int i=0;i<invoiceRemarkSetList.size();i++){ |
||||
if(i>0 && mbmc.equals(invoiceRemarkSetList.get(i).getMbmc())){ |
||||
return R.error("模板名称不能重复!"); |
||||
} |
||||
} |
||||
invoiceRemarkSetMapper.deleteByGsbm(gsbm); |
||||
for(int i=0;i<invoiceRemarkSetList.size();i++){ |
||||
InvoiceRemarkSet invoiceRemarkSet = invoiceRemarkSetList.get(i); |
||||
invoiceRemarkSet.setId(baseService.getGenerateShotKey()); |
||||
invoiceRemarkSet.setXhfNsrsbh(xhfNsrsbh); |
||||
invoiceRemarkSet.setGsbm(gsbm); |
||||
invoiceRemarkSet.setCreateTime(new Date()); |
||||
invoiceRemarkSet.setCredateUserId(user.getUserId().toString()); |
||||
invoiceRemarkSetMapper.insert(invoiceRemarkSet); |
||||
} |
||||
}else { |
||||
invoiceRemarkSetMapper.deleteByGsbm(gsbm); |
||||
} |
||||
return R.ok(); |
||||
} |
||||
} |
||||
@ -0,0 +1,122 @@ |
||||
package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy; |
||||
|
||||
import lombok.ToString; |
||||
|
||||
/** |
||||
* @Description MDM同步人员 |
||||
* @Author 巩权林 |
||||
* @Date 2023/2/9 16:59 |
||||
**/ |
||||
@ToString |
||||
public class MdmSyncUserReqBO { |
||||
|
||||
|
||||
// 主编码的值
|
||||
private String CODE; |
||||
|
||||
// 姓名的值
|
||||
private String DESC1; |
||||
|
||||
// 手机号码的值
|
||||
private String DESC10; |
||||
|
||||
// 电子邮箱的值
|
||||
private String DESC11; |
||||
|
||||
// 组织代码的值
|
||||
private String DESC14; |
||||
|
||||
// 公司代码的值
|
||||
private String DESC37; |
||||
|
||||
// 公司名称的值
|
||||
private String DESC38; |
||||
|
||||
// 人员状态的值
|
||||
private String DESC59; |
||||
|
||||
// UUID的值
|
||||
private String UUID; |
||||
|
||||
private Boolean success; |
||||
|
||||
public void setCODE(String CODE) { |
||||
this.CODE = CODE; |
||||
} |
||||
|
||||
public String getCODE() { |
||||
return CODE; |
||||
} |
||||
|
||||
public void setDESC1(String DESC1) { |
||||
this.DESC1 = DESC1; |
||||
} |
||||
|
||||
public String getDESC1() { |
||||
return DESC1; |
||||
} |
||||
|
||||
public void setDESC10(String DESC10) { |
||||
this.DESC10 = DESC10; |
||||
} |
||||
|
||||
public String getDESC10() { |
||||
return DESC10; |
||||
} |
||||
|
||||
public void setDESC11(String DESC11) { |
||||
this.DESC11 = DESC11; |
||||
} |
||||
|
||||
public String getDESC11() { |
||||
return DESC11; |
||||
} |
||||
|
||||
public void setDESC14(String DESC14) { |
||||
this.DESC14 = DESC14; |
||||
} |
||||
|
||||
public String getDESC14() { |
||||
return DESC14; |
||||
} |
||||
|
||||
public void setDESC37(String DESC37) { |
||||
this.DESC37 = DESC37; |
||||
} |
||||
|
||||
public String getDESC37() { |
||||
return DESC37; |
||||
} |
||||
|
||||
public void setDESC38(String DESC38) { |
||||
this.DESC38 = DESC38; |
||||
} |
||||
|
||||
public String getDESC38() { |
||||
return DESC38; |
||||
} |
||||
|
||||
public void setDESC59(String DESC59) { |
||||
this.DESC59 = DESC59; |
||||
} |
||||
|
||||
public String getDESC59() { |
||||
return DESC59; |
||||
} |
||||
|
||||
public void setUUID(String UUID) { |
||||
this.UUID = UUID; |
||||
} |
||||
|
||||
public String getUUID() { |
||||
return UUID; |
||||
} |
||||
|
||||
public Boolean getSuccess() { |
||||
return success; |
||||
} |
||||
|
||||
public void setSuccess(Boolean success) { |
||||
this.success = success; |
||||
} |
||||
} |
||||
@ -0,0 +1,177 @@ |
||||
<?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.dxhy.order.consumer.dao.InvoiceRemarkSetMapper" > |
||||
<resultMap id="BaseResultMap" type="com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet" > |
||||
<id column="id" property="id" jdbcType="VARCHAR" /> |
||||
<result column="xhf_nsrsbh" property="xhfNsrsbh" jdbcType="VARCHAR" /> |
||||
<result column="gsbm" property="gsbm" jdbcType="VARCHAR" /> |
||||
<result column="xh" property="xh" jdbcType="VARCHAR" /> |
||||
<result column="mbmc" property="mbmc" jdbcType="VARCHAR" /> |
||||
<result column="mbnr" property="mbnr" jdbcType="VARCHAR" /> |
||||
<result column="status" property="status" jdbcType="VARCHAR" /> |
||||
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" /> |
||||
<result column="credate_user_id" property="credateUserId" jdbcType="VARCHAR" /> |
||||
</resultMap> |
||||
<sql id="Base_Column_List" > |
||||
id, xhf_nsrsbh, gsbm, xh, mbmc, mbnr, status, create_time, credate_user_id |
||||
</sql> |
||||
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" > |
||||
select |
||||
<include refid="Base_Column_List" /> |
||||
from invoice_remark_set |
||||
where id = #{id,jdbcType=VARCHAR} |
||||
</select> |
||||
<select id="selectRemarkSetList" resultMap="BaseResultMap" parameterType="com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet" > |
||||
select |
||||
<include refid="Base_Column_List" /> |
||||
from invoice_remark_set |
||||
<where> |
||||
<if test="id != null and id != ''" > |
||||
and id = #{id,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="xhfNsrsbh != null" > |
||||
and xhf_nsrsbh = #{xhfNsrsbh,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="gsbm != null" > |
||||
and gsbm = #{gsbm,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="xh != null" > |
||||
and xh = #{xh,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="mbmc != null" > |
||||
and mbmc = #{mbmc,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="mbnr != null" > |
||||
and mbnr = #{mbnr,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="status != null" > |
||||
and status = #{status,jdbcType=VARCHAR} |
||||
</if> |
||||
<if test="createTime != null" > |
||||
and create_time#{createTime,jdbcType=TIMESTAMP} |
||||
</if> |
||||
<if test="credateUserId != null" > |
||||
and credate_user_id = #{credateUserId,jdbcType=VARCHAR} |
||||
</if> |
||||
</where> |
||||
</select> |
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.String" > |
||||
delete from invoice_remark_set |
||||
where id = #{id,jdbcType=VARCHAR} |
||||
</delete> |
||||
<delete id="deleteByGsbm" parameterType="java.lang.String" > |
||||
delete from invoice_remark_set |
||||
where gsbm = #{gsbm,jdbcType=VARCHAR} |
||||
</delete> |
||||
<insert id="insert" parameterType="com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet" > |
||||
insert into invoice_remark_set (id, xhf_nsrsbh, gsbm, |
||||
xh, mbmc, mbnr, status, |
||||
create_time, credate_user_id) |
||||
values (#{id,jdbcType=VARCHAR}, #{xhfNsrsbh,jdbcType=VARCHAR}, #{gsbm,jdbcType=VARCHAR}, |
||||
#{xh,jdbcType=VARCHAR}, #{mbmc,jdbcType=VARCHAR}, #{mbnr,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, |
||||
#{createTime,jdbcType=TIMESTAMP}, #{credateUserId,jdbcType=VARCHAR}) |
||||
</insert> |
||||
<insert id="insertSelective" parameterType="com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet" > |
||||
insert into invoice_remark_set |
||||
<trim prefix="(" suffix=")" suffixOverrides="," > |
||||
<if test="id != null" > |
||||
id, |
||||
</if> |
||||
<if test="xhfNsrsbh != null" > |
||||
xhf_nsrsbh, |
||||
</if> |
||||
<if test="gsbm != null" > |
||||
gsbm, |
||||
</if> |
||||
<if test="xh != null" > |
||||
xh, |
||||
</if> |
||||
<if test="mbmc != null" > |
||||
mbmc, |
||||
</if> |
||||
<if test="mbnr != null" > |
||||
mbnr, |
||||
</if> |
||||
<if test="status != null" > |
||||
status, |
||||
</if> |
||||
<if test="createTime != null" > |
||||
create_time, |
||||
</if> |
||||
<if test="credateUserId != null" > |
||||
credate_user_id, |
||||
</if> |
||||
</trim> |
||||
<trim prefix="values (" suffix=")" suffixOverrides="," > |
||||
<if test="id != null" > |
||||
#{id,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="xhfNsrsbh != null" > |
||||
#{xhfNsrsbh,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="gsbm != null" > |
||||
#{gsbm,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="xh != null" > |
||||
#{xh,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="mbmc != null" > |
||||
#{mbmc,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="mbnr != null" > |
||||
#{mbnr,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="status != null" > |
||||
#{status,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="createTime != null" > |
||||
#{createTime,jdbcType=TIMESTAMP}, |
||||
</if> |
||||
<if test="credateUserId != null" > |
||||
#{credateUserId,jdbcType=VARCHAR}, |
||||
</if> |
||||
</trim> |
||||
</insert> |
||||
<update id="updateByPrimaryKeySelective" parameterType="com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet" > |
||||
update invoice_remark_set |
||||
<set > |
||||
<if test="xhfNsrsbh != null" > |
||||
xhf_nsrsbh = #{xhfNsrsbh,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="gsbm != null" > |
||||
gsbm = #{gsbm,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="xh != null" > |
||||
xh = #{xh,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="mbmc != null" > |
||||
mbmc = #{mbmc,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="mbnr != null" > |
||||
mbnr = #{mbnr,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="status != null" > |
||||
status = #{status,jdbcType=VARCHAR}, |
||||
</if> |
||||
<if test="createTime != null" > |
||||
create_time = #{createTime,jdbcType=TIMESTAMP}, |
||||
</if> |
||||
<if test="credateUserId != null" > |
||||
credate_user_id = #{credateUserId,jdbcType=VARCHAR}, |
||||
</if> |
||||
</set> |
||||
where id = #{id,jdbcType=VARCHAR} |
||||
</update> |
||||
<update id="updateByPrimaryKey" parameterType="com.dxhy.order.consumer.modules.order.model.InvoiceRemarkSet" > |
||||
update invoice_remark_set |
||||
set xhf_nsrsbh = #{xhfNsrsbh,jdbcType=VARCHAR}, |
||||
gsbm = #{gsbm,jdbcType=VARCHAR}, |
||||
xh = #{xh,jdbcType=VARCHAR}, |
||||
mbmc = #{mbmc,jdbcType=VARCHAR}, |
||||
mbnr = #{mbnr,jdbcType=VARCHAR}, |
||||
status = #{status,jdbcType=VARCHAR}, |
||||
create_time = #{createTime,jdbcType=TIMESTAMP}, |
||||
credate_user_id = #{credateUserId,jdbcType=VARCHAR} |
||||
where id = #{id,jdbcType=VARCHAR} |
||||
</update> |
||||
</mapper> |
||||
Loading…
Reference in new issue