UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据同步bug修改

Browse Source
master
anthonywj 2 years ago
parent 40603c1736
commit 186f65514c
8 changed files with 34 additions and 111 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/constant/BasicProcessStatus.java
Unescape Escape View File

@ -27,7 +27,7 @@ public class BasicProcessStatus {
public static final int BASIC_THIRD_ORDER = 6; //往来单位
public static final String NEW_ALL_DATA = "7"; //用户相关信息
public static final String NEW_ALL_BUS = "8";
public static final String NEW_ALL_ORDER = "9";
public static final String NEW_ALL_ORDER = "出入库扫码单据";
public static final String NEW_ALL_BUS_ORDER = "11";
public static final String NEW_ALL_DI = "10";

6
src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
Unescape Escape View File

@ -449,7 +449,7 @@ public class SpsSyncDownloadController {
deptDao.insertOrUpdateBatch(bean.getDeptEntityList());
}
if (CollectionUtil.isNotEmpty(bean.getDeptUserEntities())) {
deptUserDao.insertOrUpdateBatch(bean.getDeptUserEntities());
deptUserDao.replaceBatch(bean.getDeptUserEntities());
}
if (CollectionUtil.isNotEmpty(bean.getInvWarehouseEntities())) {
invWarehouseDao.insertOrUpdateBatch(bean.getInvWarehouseEntities());
@ -458,7 +458,9 @@ public class SpsSyncDownloadController {
warehouseUserDao.insertOrUpdateBatch(bean.getWarehouseUserEntities());
}
if (CollectionUtil.isNotEmpty(bean.getWarehouseBussinessTypeEntities())) {
warehouseBussinessTypeDao.insertOrUpdateBatch(bean.getWarehouseBussinessTypeEntities());
for (WarehouseBussinessTypeEntity warehouseBussinessTypeEntity : bean.getWarehouseBussinessTypeEntities()) {
warehouseBussinessTypeDao.insertOrUpdate(warehouseBussinessTypeEntity);
}
}
if (CollectionUtil.isNotEmpty(bean.getInvSpaces())) {
invSpaceDao.insertOrUpdateBatch(bean.getInvSpaces());

2
src/main/java/com/glxp/api/dao/auth/DeptUserDao.java
Unescape Escape View File

@ -30,5 +30,7 @@ public interface DeptUserDao extends BaseMapperPlus<DeptUserDao, DeptUserEntity,
int insertBatch(List<DeptUserEntity> list);
int replaceBatch(@Param("list")List<DeptUserEntity> list);
}

6
src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java
Unescape Escape View File

@ -15,12 +15,6 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussi
int deleteByPrimaryKey(Integer id);
int insert(WarehouseBussinessTypeEntity record);
// int insertOrUpdate(WarehouseBussinessTypeEntity record);
int insertOrUpdateSelective(WarehouseBussinessTypeEntity record);
int insertSelective(WarehouseBussinessTypeEntity record);
WarehouseBussinessTypeEntity selectByPrimaryKey(Integer id);

4
src/main/java/com/glxp/api/entity/auth/WarehouseBussinessTypeEntity.java
Unescape Escape View File

@ -17,7 +17,7 @@ public class WarehouseBussinessTypeEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.AUTO)
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
@ -39,7 +39,7 @@ public class WarehouseBussinessTypeEntity {
private String name;
@TableField("updateTime")
private Date updateTimel;
private Date updateTime;
@TableField(exist = false)
private boolean select;

2
src/main/java/com/glxp/api/entity/auth/WarehouseUserEntity.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class WarehouseUserEntity {
@TableField("isDirector")
private boolean isDirector;
@TableField("employeeName")
@TableField(exist = false)
private String employeeName;
@TableField("updateTime")

37
src/main/resources/mybatis/mapper/auth/DeptUserDao.xml
Unescape Escape View File

@ -5,8 +5,8 @@
<mapper namespace="com.glxp.api.dao.auth.DeptUserDao">
<select id="selectDeptUser" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
resultType="com.glxp.api.entity.auth.DeptUserEntity">
SELECT *
FROM auth_dept_user
SELECT *
FROM auth_dept_user
<where>
<if test="deptId != null">
and deptId = #{deptId}
@ -26,7 +26,7 @@
auth_dept.`name` deptName,
auth_user.comments
FROM auth_dept_user
right JOIN auth_user
right JOIN auth_user
on auth_dept_user.userId = auth_user.id
left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
<where>
@ -47,14 +47,14 @@
<select id="selectJoinDeptUserKey" parameterType="com.glxp.api.req.auth.FilterDeptUserReqeust"
resultType="com.glxp.api.res.auth.DeptUserResponse">
SELECT auth_dept_user.*,
auth_user.userName,
auth_user.employeeName,
auth_dept.`name` deptName,
auth_user.comments
auth_user.userName,
auth_user.employeeName,
auth_dept.`name` deptName,
auth_user.comments
FROM auth_dept_user
left JOIN auth_user
on auth_dept_user.userId = auth_user.id
left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
left JOIN auth_user
on auth_dept_user.userId = auth_user.id
left JOIN auth_dept on auth_dept_user.deptId = auth_dept.id
<where>
<if test="deptId != null">
and deptId = #{deptId}
@ -64,7 +64,7 @@
</if>
<if test="key != null and key != ''">
and (auth_user.userName like concat('%', #{key}, '%') or
auth_user.employeeName like concat('%', #{key}, '%'))
auth_user.employeeName like concat('%', #{key}, '%'))
</if>
</where>
</select>
@ -101,12 +101,23 @@
<insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
insert INTO auth_dept_user
(deptId, userId)
(deptId, userId, updateTime)
values
<foreach collection="list" item="item" index="index"
separator=",">
(#{item.deptId},
#{item.userId}, #{item.updateTime})
</foreach>
</insert>
<insert id="replaceBatch" keyProperty="id" parameterType="java.util.List">
replace INTO auth_dept_user
(deptId, userId, updateTime)
values
<foreach collection="list" item="item" index="index"
separator=",">
(#{item.deptId},
#{item.userId})
#{item.userId}, #{item.updateTime})
</foreach>
</insert>
</mapper>

86
src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
Unescape Escape View File

@ -27,12 +27,6 @@
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into auth_warehouse_bustype (code, `action`, `name`)
values (#{code,jdbcType=VARCHAR}, #{action,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
@ -150,86 +144,6 @@
(#{item.code,jdbcType=VARCHAR}, #{item.action,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR})
</foreach>
</insert>
<!-- <insert id="insertOrUpdate" keyColumn="id" keyProperty="id"-->
<!-- parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">-->
<!-- &lt;!&ndash;@mbg.generated&ndash;&gt;-->
<!-- insert into auth_warehouse_bustype-->
<!-- <trim prefix="(" suffix=")" suffixOverrides=",">-->
<!-- <if test="id != null">-->
<!-- id,-->
<!-- </if>-->
<!-- code,-->
<!-- `action`,-->
<!-- `name`,-->
<!-- </trim>-->
<!-- values-->
<!-- <trim prefix="(" suffix=")" suffixOverrides=",">-->
<!-- <if test="id != null">-->
<!-- #{id,jdbcType=INTEGER},-->
<!-- </if>-->
<!-- #{code,jdbcType=VARCHAR},-->
<!-- #{action,jdbcType=VARCHAR},-->
<!-- #{name,jdbcType=VARCHAR},-->
<!-- </trim>-->
<!-- on duplicate key update-->
<!-- <trim suffixOverrides=",">-->
<!-- <if test="id != null">-->
<!-- id = #{id,jdbcType=INTEGER},-->
<!-- </if>-->
<!-- code = #{code,jdbcType=VARCHAR},-->
<!-- `action` = #{action,jdbcType=VARCHAR},-->
<!-- `name` = #{name,jdbcType=VARCHAR},-->
<!-- </trim>-->
<!-- </insert>-->
<insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into auth_warehouse_bustype
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="code != null">
code,
</if>
<if test="action != null">
`action`,
</if>
<if test="name != null">
`name`,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="code != null">
#{code,jdbcType=VARCHAR},
</if>
<if test="action != null">
#{action,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
<if test="id != null">
id = #{id,jdbcType=INTEGER},
</if>
<if test="code != null">
code = #{code,jdbcType=VARCHAR},
</if>
<if test="action != null">
`action` = #{action,jdbcType=VARCHAR},
</if>
<if test="name != null">
`name` = #{name,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="selectListByCode" parameterType="java.lang.String" resultMap="BaseResultMap">
select auth_warehouse_bustype.id,

Write Preview
Loading…
Cancel
Save