修改导入数据有重复的情况处理

671a73cd · 彭祥礼 · 20de7056 · 671a73cd · 671a73cd · 671a73cd
Commit 671a73cd authored May 08, 2020 by 彭祥礼
4 changed files
--- a/service-manager/src/main/java/com/winsun/controller/LzKpiController.java
+++ b/service-manager/src/main/java/com/winsun/controller/LzKpiController.java
@@ -38,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 /**
@@ -578,9 +579,9 @@ public class LzKpiController extends BaseController {
        if (!listMap.get(0).get("k").toString().equals(SL_schoolName)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        /*if (listMap.get(0).size() != 11) {
+        if (listMap.get(0).size() != 11) {
            return ResponseData.error("模板不对，请选择正确的模板！");
-        }*/
+        }
        List<String> accountList = new LinkedList<>();
        List<Map<String,Object>> sysUserList = new LinkedList<>();
@@ -642,18 +643,6 @@ public class LzKpiController extends BaseController {
                if (StringUtils.isBlank(temp.get("i").toString())) {
                    return ResponseData.error("第" + (i + 1) + "行的账号不能为空");
                }
-                /*if (!temp.containsKey("j")) {
-                    return ResponseData.error("第" + (i + 1) + "行的县分不能为空");
-                }
-                if (StringUtils.isBlank(temp.get("j").toString())) {
-                    return ResponseData.error("第" + (i + 1) + "行的县分不能为空");
-                }
-                if (!temp.containsKey("k")) {
-                    return ResponseData.error("第" + (i + 1) + "行的学校名不能为空");
-                }
-                if (StringUtils.isBlank(temp.get("k").toString())) {
-                    return ResponseData.error("第" + (i + 1) + "行的学校名不能为空");
-                }*/
                if (temp.containsKey("i")) {
                    accountList.add(temp.get("i").toString());
                }
@@ -672,25 +661,30 @@ public class LzKpiController extends BaseController {
                }
            }
            //检查excel表中是否有重复人员编号
-            /*int size = listMap.size();
+            int size = listMap.size();
            Set<String> accountSet = new HashSet<>(size);
            for (int i = 0; i < size; i++) {
                Map<String, Object> temp = listMap.get(i);
-                accountSet.add((String) temp.get("b"));
+                accountSet.add((String) temp.get("i"));
            }
            if (accountSet.size() != size) {
                return ResponseData.error("文件中有重复的用户账号，请确认用户账号不能重复!");
-            }*/
+            }
        } catch (Exception e) {
            log.error("楼长KPI信息导入异常", e.getMessage());
            return ResponseData.error("导入异常！");
        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");// 格式化时间
+        Calendar c = Calendar.getInstance();
+        //过去6个月
+        c.add(Calendar.MONTH, -6);
+        Date m = c.getTime();
+        Wrapper<LzKpi> lzKpiWrapper = new EntityWrapper<>();
+        lzKpiWrapper.ge("month",sdf.format(m));
+        lzKpiWrapper.le("month",sdf.format(new Date()));
+        List<LzKpi> lzKpiList = lzKpiMapper.selectList(lzKpiWrapper);
        int number = 0;
-        Date acceptDate = new Date();
-        Date successTime = acceptDate;
        for (int i = 1; i < listMap.size(); i++) {
            Map<String, Object> map = listMap.get(i);
            LzKpi lzKpi = new LzKpi();
@@ -715,6 +709,21 @@ public class LzKpiController extends BaseController {
            if (StringUtils.isNotBlank(map.get("h").toString())) {
                userId0 = map.get("h").toString();
            }
+            boolean isUpdate = false;
+            for (LzKpi lzKpi1 : lzKpiList) {
+                if(lzKpi1.getUserId().equals(userId)){
+                    lzKpi.setId(lzKpi1.getId());
+                    isUpdate = true;
+                    break;
+                }
+            }
+            try {
+                if(isUpdate){
+                    Wrapper<LzKpi> wrapper = new EntityWrapper<>();
+                    wrapper.eq("id",lzKpi.getId());
+                    lzKpiMapper.update(lzKpi,wrapper);
+                    number++;
+                }else{
                    Integer integer = lzKpiMapper.insert(lzKpi);
                    if (integer == 1) {
                        number++;
@@ -722,6 +731,12 @@ public class LzKpiController extends BaseController {
                        error.append("第" + (i + 1) + "行的更新失败,");
                    }
                }
+            }catch (Exception e){
+                log.info(e.getMessage());
+                error.append("第" + (i + 1) + "行的更新失败,");
+            }
+        }
        error.append("成功更新" + number + "条数据！");
        return ResponseData.success(error.toString(), "导入完成");
    }

--- a/service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
+++ b/service-manager/src/main/java/com/winsun/controller/LzSalaryController.java
@@ -359,7 +359,6 @@ public class LzSalaryController extends BaseController {
        Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
        usWrapper.in("school_id",schoolIds);
        List<UserSchool> userSchoolList = userSchoolMapper.selectList(usWrapper);
-        List<UserSchool> userSchoolsTemp = new ArrayList<>();
        for (UserSchool userSchool : userSchoolList) {
            userIds2.add(userSchool.getUserId());
        }

--- a/service-manager/src/main/java/com/winsun/controller/YxtCouponController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YxtCouponController.java
@@ -100,15 +100,10 @@ public class YxtCouponController extends BaseController {
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
            return ResponseData.error("无数据权限");
        }
-        Wrapper wrapper = new EntityWrapper<>();
+        if(StringUtils.isNotBlank(id)){
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+            yxtCouponMapper.deleteById(Integer.valueOf(id));
-        Map<String, Object> dataMapping = new HashMap<>();
-        dataMapping.put("del_flag", isdel);
-        yxtCouponMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
-        /*if(StringUtils.isNotBlank(id)){
-            lzKpiMapper.deleteById(id);
            return ResponseData.success("操作成功！");
-        }*/
+        }
        return ResponseData.success("操作成功!");
    }
@@ -424,22 +419,22 @@ public class YxtCouponController extends BaseController {
            }
            //检查excel表中是否有重复人员编号
-            /*int size = listMap.size();
+            int size = listMap.size();
            Set<String> accountSet = new HashSet<>(size);
            for (int i = 0; i < size; i++) {
                Map<String, Object> temp = listMap.get(i);
-                accountSet.add((String) temp.get("b"));
+                accountSet.add((String) temp.get("a"));
            }
            if (accountSet.size() != size) {
-                return ResponseData.error("文件中有重复的用户账号，请确认用户账号不能重复!");
+                return ResponseData.error("文件中有重复的兑换券账号，请确认兑换券账号不能重复!");
-            }*/
+            }
        } catch (Exception e) {
            log.error("兑换券信息导入异常", e.getMessage());
            return ResponseData.error("导入异常！");
        }
+        Wrapper<YxtCoupon> yxtCouponWrapper = new EntityWrapper<>();
+        List<YxtCoupon> yxtCouponList = yxtCouponMapper.selectList(yxtCouponWrapper);
        int number = 0;
-        Date acceptDate = new Date();
        for (int i = 1; i < listMap.size(); i++) {
            Map<String, Object> map = listMap.get(i);
            YxtCoupon yxt = new YxtCoupon();
@@ -463,13 +458,39 @@ public class YxtCouponController extends BaseController {
            }
            Date validityPeriod = DateUtil.parse(map.get("e").toString(), "yyyy-mm-dd");
            yxt.setValidityPeriod(validityPeriod);
-            yxt.setUpdateDate(DateUtil.parse((new Date()).toString(),"yyyy-mm-dd"));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");// 格式化时间
-            String delFlag = map.get("f").toString();
+            Date updateDate = DateUtil.parse(sdf.format(new Date()),"yyyy-mm-dd");
+            yxt.setUpdateDate(updateDate);
+            String delFlag = map.get("g").toString();
            if(delFlag.equals("未删除")){
                yxt.setDelFlag(0);
            }else{
                yxt.setDelFlag(1);
            }
+            boolean isUpdate = false;
+            for (YxtCoupon yxtCoupon : yxtCouponList) {
+                if(yxtCoupon.getCardNumber().equals(cardNumber)){
+                    yxt.setId(yxtCoupon.getId());
+                    isUpdate = true;
+                    break;
+                }
+            }
+            try {
+                if(isUpdate){
+                    Wrapper<YxtCoupon> wrapper = new EntityWrapper<>();
+                    wrapper.eq("id", yxt.getId());
+                    /*wrapper11.eq("id", yxt.getId());
+                    Map<String, Object> dataMapping11 = new HashMap<>();
+                    dataMapping11.put("card_number", yxt.getCardNumber());
+                    dataMapping11.put("password", yxt.getPassword());
+                    dataMapping11.put("updateDate", yxt.getUpdateDate());
+                    dataMapping11.put("state", yxt.getState());
+                    dataMapping11.put("validityPeriod", yxt.getValidityPeriod());
+                    dataMapping11.put("shelfState", yxt.getShelfState());
+                    yxtCouponMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping11), wrapper11);*/
+                    yxtCouponMapper.update(yxt,wrapper);
+                    number++;
+                }else{
                    Integer integer = yxtCouponMapper.insert(yxt);
                    if (integer == 1) {
                        number++;
@@ -477,6 +498,13 @@ public class YxtCouponController extends BaseController {
                        error.append("第" + (i + 1) + "行的更新失败,");
                    }
                }
+            }catch (Exception e){
+                log.info(e.getMessage());
+                error.append("第" + (i + 1) + "行的更新失败,");
+            }
+        }
        error.append("成功更新" + number + "条数据！");
        return ResponseData.success(error.toString(), "导入完成");
    }

--- a/service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/YxtOrderController.java
@@ -90,13 +90,23 @@ public class YxtOrderController extends BaseController {
        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
            return ResponseData.error("无数据权限");
        }
        if (StringUtils.isNotBlank(id)) {
            Wrapper wrapper = new EntityWrapper<>();
            wrapper.eq(StringUtils.isNotBlank(id),"id", id);
            Map<String, Object> dataMapping = new HashMap<>();
            dataMapping.put("state", 4);//已取消订单
            yxtOrderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
+            List<Integer> yxtIds = new ArrayList<>();
+            Wrapper<YxtOrderDetail> wrapper0 = new EntityWrapper<>();
+            wrapper0.eq("order_id", id);
+            List<YxtOrderDetail> yxtOrderList = yxtOrderDetailMapper.selectList(wrapper0);
+            for (YxtOrderDetail yod : yxtOrderList) {
+                Wrapper wrapper11 = new EntityWrapper<>();
+                wrapper11.eq("id", yod.getYxtId());
+                Map<String, Object> dataMapping11 = new HashMap<>();
+                dataMapping11.put("state", 1);
+                yxtCouponMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping11), wrapper11);
+            }
            return ResponseData.success("操作成功！");
        }
        return ResponseData.error("删除id不通为空!");
@@ -129,7 +139,6 @@ public class YxtOrderController extends BaseController {
        Wrapper<YxtOrderDetail> wrapper = new EntityWrapper<>();
        wrapper.eq("order_id", orderId);
        List<YxtOrderDetail> yxtOrderList = yxtOrderDetailMapper.selectList(wrapper);
        for (YxtOrderDetail yxtOrderDetail : yxtOrderList) {
            yxtIds.add(yxtOrderDetail.getYxtId());
        }