fix

wzy

2021-07-13 d103d31aac5749e229e9f6ff73c02f9019690f2e

fix

 zq-erp/src/main/java/com/matrix/system/common/dao/SysUsersDao.java

@@ -125,4 +125,6 @@

    public List<AppVersion> selectAppVersion();

    SysUsers selectSysUsersByName(@Param("name") String name);

}

 zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java

@@ -1734,6 +1734,29 @@
        }
    }

    @Transactional
    public void updateVipInfoStaff(List<SysVipInfo> sysVipInfos) {
        Map<String, Integer> shopStaff = getRedisIds("shop_staff");

        for (SysVipInfo sysVipInfo : sysVipInfos) {
            if (sysVipInfo.getStaffId() == null) {
                continue;
            }

            Integer integer = shopStaff.get(sysVipInfo.getStaffId().toString());
            if (integer == null) {
                continue;
            }

            SysVipInfo exist = sysVipInfoDao.selectByPhone(sysVipInfo.getPhone());
            if (exist.getStaffId() == integer.longValue()) {
                continue;
            }

            sysVipInfoDao.updateStaffIdByPhone(integer.longValue(), sysVipInfo.getPhone());
        }
    }

    @Transactional(rollbackFor = Exception.class)
    public void updateProjUseIsCourse() {
        List<SysProjUse> sysProjUses = sysProjUseDao.selectProjUse();
@@ -1757,4 +1780,100 @@
            sysProjUseDao.update(update);
        }
    }

    @DS("slave")
    public List<SysUsers> fixSysUsersOld() throws UnsupportedEncodingException, NoSuchAlgorithmException {
        List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_shopstaff_info");

        Map<String, Integer> shopMap = getRedisIds("shopId");
        List<SysUsers> list = new ArrayList<>();
        for (Map<String, Object> map : maps) {
            SysUsers sysUsers = new SysUsers();
            sysUsers.setSuAccount((String) map.get("staff_no"));
            sysUsers.setSuId((Long) map.get("id"));
            sysUsers.setSuName((String) map.get("staff_name"));
            sysUsers.setSuSex((String) map.get("sex"));
            sysUsers.setSuUserType("employee");
            sysUsers.setSuAccountStatus(AppConstance.ACCOUNT_STATUS_INACTIVATED);
            sysUsers.setSuValid("N");
            sysUsers.setCompanyId(companyId);
            Long aaa = (Long) map.get("shop_id");
            if (aaa != null) {
                Integer shopId = shopMap.get(aaa.toString());
                if (shopId != null) {
                    sysUsers.setShopId(Long.parseLong(shopId.toString()));
                }
            }
            sysUsers.setSuRegisterTime(new Date());
            sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
            sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
            sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
            list.add(sysUsers);
        }

        return list;
    }

    @Transactional(rollbackFor = Exception.class)
    public void fixSysUsersNew(List<SysUsers> list) {
        Map<String, Integer> shopStaff = getRedisIds("shop_staff");

        for (SysUsers sysUsers : list) {
            SysUsers exist = sysUsersDao.selectSysUsersByName(sysUsers.getSuName());
            if (exist != null) {
                continue;
            }

            Integer newId = shopStaff.get(sysUsers.getSuId().toString());
            sysUsers.setSuId(newId.longValue());
            sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
            sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
            sysUsersDao.insert(sysUsers);
        }

    }


    @Transactional(rollbackFor = Exception.class)
    public void fixShoppingGoods() {
        List<ShoppingGoodsAssemble> shoppingGoodsAssembles = shoppingGoodsAssembleDao.selectProjIdNotNull();

        for (ShoppingGoodsAssemble shoppingGoodsAssemble : shoppingGoodsAssembles) {
            Map<String, Object> map = shoppingGoodsAssembleDao.selectProjInfoById(shoppingGoodsAssemble.getAssembleProjId());

            String proj_name = map.get("PROJ_NAME").toString();
            ShoppingGoods exist = shoppingGoodsDao.selectByNameAndDesc(proj_name, "数据修复");
            if (exist != null) {
                ShoppingGoodsAssemble update = new ShoppingGoodsAssemble();
                update.setId(shoppingGoodsAssemble.getId());
                update.setAssembleGoodId(exist.getId());
                shoppingGoodsAssembleDao.update(update);
                continue;
            }

            ShoppingGoods shoppingGoods = new ShoppingGoods();
            shoppingGoods.setName(proj_name);
            shoppingGoods.setTimeLength(Integer.parseInt(map.get("TIME_LENGTH").toString()));

            shoppingGoods.setCompanyId(companyId);
            shoppingGoods.setHeadquarters(1);
            shoppingGoods.setIsDel(1);
            shoppingGoods.setZjm(StringUtils.toHanyuPinyin(shoppingGoods.getName()) + "," + StringUtils.toHeadWordHanyuPinyin(shoppingGoods.getName()));

            shoppingGoods.setWeiDescription("数据迁移");
            shoppingGoods.setStaus("下架");
            shoppingGoods.setGoodType("项目");
            shoppingGoods.setIsPresent("否");
            shoppingGoods.setIsOnce("0");
            shoppingGoods.setWeiDescription("数据修复");

            shoppingGoodsDao.insert(shoppingGoods);

            ShoppingGoodsAssemble update = new ShoppingGoodsAssemble();
            update.setId(shoppingGoodsAssemble.getId());
            update.setAssembleGoodId(shoppingGoods.getId());
            shoppingGoodsAssembleDao.update(update);
        }
    }

}

 zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsAssembleDao.java

@@ -1,6 +1,7 @@
package com.matrix.system.hive.dao;

import java.util.List;
import java.util.Map;

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.vo.ShoppingGoodsDetailVo;
@@ -66,4 +67,8 @@
    public void batchInsert(@Param("list") List<ShoppingGoodsAssemble> list);

    List<ShoppingGoodsDetailVo> selectGoodsRelationGoodsList(@Param("goodsId") Long id, @Param("goodsType") String goodsType);

    List<ShoppingGoodsAssemble> selectProjIdNotNull();

    Map<String, Object> selectProjInfoById(@Param("id") Long id);
}

 zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsDao.java

@@ -91,4 +91,6 @@
    int selectShopppingGoodsAipTotal(@Param("record") ShoppingGoodsListDto shoppingGoodsListDto);

    public List<ShoppingGoods> selectByIds(@Param("ids")List<Integer> ids);

    ShoppingGoods selectByNameAndDesc(@Param("name") String name, @Param("description") String description);
}

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java

@@ -210,4 +210,6 @@
    com.matrix.system.app.vo.VipInfoVo selectVipInfoById(@Param("id") Long id);

    List<SysVipInfo> selectStaff();

    int updateStaffIdByPhone(@Param("staffId") Long staffId, @Param("phone") String phone);
}

 zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml

@@ -1321,4 +1321,8 @@
    <select id="selectAppVersion" resultType="com.matrix.system.hive.bean.AppVersion">
        select * from app_version
    </select>

    <select id="selectSysUsersByName" resultMap="SysUsersMap">
        select * from sys_users where su_name=#{name}
    </select>
</mapper>

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsAssembleDao.xml

@@ -446,4 +446,11 @@
    </select>


    <select id="selectProjIdNotNull" resultType="ShoppingGoodsAssemble">
        select * from shopping_goods_assemble where assemble_proj_id is not null
    </select>

    <select id="selectProjInfoById" resultType="java.util.HashMap">
        select * from sys_proj_info where id=#{id}
    </select>
</mapper>

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -1306,4 +1306,9 @@
            #{item}
        </foreach>
    </select>

    <select id="selectByNameAndDesc" resultMap="ShoppingGoodsSimpleMap">
        select * from shopping_goods
        where name=#{name} and wei_description=#{description}
    </select>
</mapper>

 zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml

@@ -1370,5 +1370,10 @@
    <select id="selectStaff" resultType="com.matrix.system.hive.bean.SysVipInfo">
        select * from sys_vip_info where 1000 > staff_id;
    </select>

    <update id="updateStaffIdByPhone">
        update sys_vip_info set staff_id=#{staffId}
        where phone=#{phone}
    </update>
</mapper>
    

 zq-erp/src/test/java/com/matrix/DataMoveTest.java

@@ -173,11 +173,21 @@

    @Test
    public void updateVipInfoStaff() {
        dataMove.updateVipInfoStaff();
        dataMove.updateVipInfoStaff(dataMove.vipInfoOld());
    }

    @Test
    public void updateProjUseIsCoures() {
        dataMove.updateProjUseIsCourse();
    }

    @Test
    public void fixSysUser() throws UnsupportedEncodingException, NoSuchAlgorithmException {
        dataMove.fixSysUsersNew(dataMove.fixSysUsersOld());
    }

    @Test
    public void fixShoppingGoods() {
        dataMove.fixShoppingGoods();
    }
}