modify

wzy

2021-04-01 0d35760f3d68e72bca1097dae1ee69aed2d2fc91

modify

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

@@ -1223,10 +1223,11 @@

        Map<String, Integer> vipInfos = getRedisIds("vip_info");
        Map<String, Integer> bedInfos = getRedisIds("bed_info");
        Map<String, Integer> sysUsers = getRedisIds("sys_users");
//        Map<String, Integer> sysUsers = getRedisIds("sys_users");
        Map<String, Integer> projUses = getRedisIds("proj_use");
        Map<String, Integer> goodProj = getRedisIds("shopping_goods_proj");
        Map<String, Integer> shopIds = getRedisIds("shopId");
        Map<String, Integer> shopStaff = getRedisIds("shop_staff");
        for (SysProjServices sysProjServices : list) {
            List<Map<String, Object>> beauticiansMap = jdbcTemplate.queryForList("select * from sys_beautician_state where SERVICES_ID=" + sysProjServices.getId());
//            Map<String, Object> bedStatesMap = jdbcTemplate.queryForMap("select * from sys_bed_state where SERVICE_ID=" + sysProjServices.getId());
@@ -1264,7 +1265,7 @@
            }

            if (sysProjServices.getBeauticianId() != null) {
                Integer beautyId = sysUsers.get(sysProjServices.getBeauticianId().toString());
                Integer beautyId = shopStaff.get(sysProjServices.getBeauticianId().toString());
                if (beautyId != null) {
                    sysProjServices.setBeauticianId(beautyId.longValue());
                } else {
@@ -1273,7 +1274,7 @@
            }

            if (sysProjServices.getDevisionId() != null) {
                Integer devisionId = sysUsers.get(sysProjServices.getDevisionId().toString());
                Integer devisionId = shopStaff.get(sysProjServices.getDevisionId().toString());
                if (devisionId != null) {
                    sysProjServices.setDevisionId(devisionId.longValue());
                } else {
@@ -1282,7 +1283,7 @@
            }

            if (sysProjServices.getCreateStaffId() != null) {
                Integer staffId = sysUsers.get(sysProjServices.getCreateStaffId().toString());
                Integer staffId = shopStaff.get(sysProjServices.getCreateStaffId().toString());
                if (staffId != null) {
                    sysProjServices.setCreateStaffId(staffId.longValue());
                } else {
@@ -1330,10 +1331,10 @@
                    achieveNew.setShopId(shopId != null ? shopId.longValue() : -achieveNew.getShopId());
                    achieveNew.setVipId(vipId != null ? vipId.longValue() : -achieveNew.getVipId());

                    Integer saleIdInt = sysUsers.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
                    Integer saleIdInt = shopStaff.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
                    achieveNew.setSaleId(saleIdInt == null ? -achieveNew.getSaleId() : saleIdInt);

                    Integer beaultyIdInt = sysUsers.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
                    Integer beaultyIdInt = shopStaff.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
                    achieveNew.setBeaultId(beaultyIdInt == null ? -achieveNew.getBeaultId() : beaultyIdInt);

                    if (achieveNew.getShoppingGoodsId() != null) {

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

@@ -132,7 +132,7 @@
        dataMove.bedInfoNew(dataMove.bedInfoOld());
    }

    @Test
//    @Test
    public void projUseMoveTest() {
        dataMove.projUseNew(dataMove.projUseMoveOld());
    }