From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
index 24dadb2..49d54a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
@@ -1,7 +1,9 @@
 package com.doumee.service.business.impl;
 
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.VisitReasonMapper;
 import com.doumee.dao.business.model.VisitReason;
@@ -14,6 +16,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,33 +31,48 @@
     private VisitReasonMapper visitReasonMapper;
 
     @Override
-    public Integer create(VisitReason visitReason) {
-        visitReasonMapper.insert(visitReason);
-        return visitReason.getId();
+    public Integer create(VisitReason model) {
+        model.setCreator(model.getLoginUserInfo().getId());
+        model.setEditor(model.getCreator());
+        model.setIsdeleted(Constants.ZERO);
+        model.setEditDate(new Date());
+        model.setCreateDate(model.getEditDate());
+        visitReasonMapper.insert(model);
+        return model.getId();
     }
 
     @Override
-    public void deleteById(Integer id) {
-        visitReasonMapper.deleteById(id);
+    public void deleteById(Integer id, LoginUserInfo userInfo) {
+        VisitReason update = new VisitReason();
+        update.setEditor(userInfo.getId());
+        update.setEditDate(new Date());
+        update.setIsdeleted(Constants.ONE);
+        update.setId(id);
+        visitReasonMapper.updateById(update);
+
     }
 
     @Override
-    public void delete(VisitReason visitReason) {
+    public void delete(VisitReason visitReason, LoginUserInfo userInfo) {
         UpdateWrapper<VisitReason> deleteWrapper = new UpdateWrapper<>(visitReason);
         visitReasonMapper.delete(deleteWrapper);
     }
 
     @Override
-    public void deleteByIdInBatch(List<Integer> ids) {
+    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo userInfo) {
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        visitReasonMapper.deleteBatchIds(ids);
+        for(Integer id :ids){
+         deleteById(id,userInfo);
+        }
     }
 
     @Override
-    public void updateById(VisitReason visitReason) {
-        visitReasonMapper.updateById(visitReason);
+    public void updateById(VisitReason model) {
+        model.setEditor(model.getLoginUserInfo().getId());
+        model.setEditDate(new Date());
+        visitReasonMapper.updateById(model);
     }
 
     @Override
@@ -81,6 +99,7 @@
     @Override
     public List<VisitReason> findList(VisitReason visitReason) {
         QueryWrapper<VisitReason> wrapper = new QueryWrapper<>(visitReason);
+        wrapper.eq("isdeleted",Constants.ZERO);
         return visitReasonMapper.selectList(wrapper);
     }
   
@@ -89,6 +108,7 @@
         IPage<VisitReason> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         QueryWrapper<VisitReason> queryWrapper = new QueryWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
+        pageWrap.getModel().setIsdeleted(Constants.ZERO);
         queryWrapper.lambda()
                 .eq(pageWrap.getModel().getId() != null, VisitReason::getId, pageWrap.getModel().getId())
                 .eq(pageWrap.getModel().getCreator() != null, VisitReason::getCreator, pageWrap.getModel().getCreator())
@@ -99,9 +119,10 @@
                 .le(pageWrap.getModel().getEditDate() != null, VisitReason::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
                 .eq(pageWrap.getModel().getIsdeleted() != null, VisitReason::getIsdeleted, pageWrap.getModel().getIsdeleted())
                 .eq(pageWrap.getModel().getRemark() != null, VisitReason::getRemark, pageWrap.getModel().getRemark())
-                .eq(pageWrap.getModel().getTitle() != null, VisitReason::getTitle, pageWrap.getModel().getTitle())
+                .like(pageWrap.getModel().getTitle() != null, VisitReason::getTitle, pageWrap.getModel().getTitle())
                 .eq(pageWrap.getModel().getSortnum() != null, VisitReason::getSortnum, pageWrap.getModel().getSortnum())
                 .eq(pageWrap.getModel().getType() != null, VisitReason::getType, pageWrap.getModel().getType())
+                .orderByAsc(VisitReason::getSortnum)
         ;
         for(PageWrap.SortData sortData: pageWrap.getSorts()) {
             if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -118,4 +139,8 @@
         QueryWrapper<VisitReason> wrapper = new QueryWrapper<>(visitReason);
         return visitReasonMapper.selectCount(wrapper);
     }
+
+
+
+
 }

--
Gitblit v1.9.3