bug fix

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>mainbiz</artifactId>
-	<version>v5.2.0</version>
+	<version>v5.3.0</version>
 	<name>mainbiz</name>
 	<description>com.huiju.welcome main service</description>
 

src/main/java/com.huiju.welcome/controller/SysDictController.java

@@ -138,4 +138,25 @@ public class SysDictController extends BaseController {
         }
         return responseBean;
     }
+
+    @RequestMapping(value="/sysDict",method= RequestMethod.GET)
+    public ResponseBean list(@RequestParam(required = false) String type) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
+            if(!StringUtils.isEmpty(type)){
+                queryWrapper.eq("type",type);
+            }
+            queryWrapper.orderByAsc("type");
+            queryWrapper.orderByDesc("sort");
+            queryWrapper.orderByDesc("create_date");
+
+            responseBean.addSuccess(iSysDictService.list(queryWrapper));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getByType -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com.huiju.welcome/controller/TaCustomerController.java

@@ -330,6 +330,7 @@ public class TaCustomerController extends BaseController {
 
             responseBean.addSuccess(result);
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("taCustomerList -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
@@ -388,13 +389,27 @@ public class TaCustomerController extends BaseController {
     
         String userId = JWTUtils.getSubject(request);
         SysUser user = iSysUserService.getById(iTaWechatUserService.getById(userId).getPersonId());
-        if (null != user && !user.getUserIdentity().equals(CommConstant.IDENTITY_CONSULTANT_MANAGER)){
-            responseBean.addError("你不是置业经理");
+
+        List<String> allowRights = new ArrayList<String>(){{
+            add(CommConstant.IDENTITY_CONSULTANT_MANAGER);
+            add(CommConstant.IDENTITY_CHANNEL_MANAGER);
+            add(CommConstant.IDENTITY_GENERAL_MANAGER);
+        }};
+
+        if (null != user && !allowRights.contains(user.getUserIdentity())){
+            responseBean.addError("您无权限进行该操作");
             return responseBean;
         }
         
-        TaCustomer taCustomer = JSONObject.parseObject(paramStr, TaCustomer.class);
-        taCustomer.setCustomerId(id);
+        TaCustomer input = JSONObject.parseObject(paramStr, TaCustomer.class);
+        TaCustomer taCustomer = iTaCustomerService.getById(id);
+        if (null == taCustomer) {
+            responseBean.addError("当前客户不存在");
+            return responseBean;
+        }
+
+        taCustomer.setConsultantId(input.getConsultantId());
+        taCustomer.setRealtyConsultant(input.getRealtyConsultant());
         
         try {
             if (iTaCustomerService.updateById(taCustomer)){

src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java

@@ -170,9 +170,13 @@ public class TaVisitorAppointmentController extends BaseController {
     public ResponseBean myAppointmentList(@RequestParam(defaultValue = "1") int pageNum,
                                           @RequestParam(defaultValue = "10") int pageSize,
                                           @RequestParam(defaultValue = "") String nameOrPhone,
+                                          @RequestParam(defaultValue = "true") Boolean mine,
+                                          @RequestParam(required = false) String identity,
                                           HttpServletRequest request) {
         TaWechatUser user = iTaWechatUserService.getById(Integer.valueOf(JWTUtils.getSubject(request)));
-        IPage<TaVisitorAppointment> result = taVisitorAppointmentService.getMyAppointmentList(pageNum, pageSize, user.getPersonId(), nameOrPhone);
+        Integer personId = mine ? user.getPersonId() : null;
+
+        IPage<TaVisitorAppointment> result = taVisitorAppointmentService.getMyAppointmentList(pageNum, pageSize, personId, nameOrPhone, identity);
         return ResponseBean.success(result);
     }
     

src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java

@@ -38,7 +38,7 @@ public class AccessInterceptor implements HandlerInterceptor {
         "/websocket",
          "/face",
         "/miniapp/login",
-            "/excel/usherListExcel"
+        "/excel/usherListExcel"
     };
 
     /*

src/main/java/com.huiju.welcome/mapper/TaVisitorAppointmentMapper.java

@@ -21,7 +21,7 @@ public interface TaVisitorAppointmentMapper extends BaseMapper<TaVisitorAppointm
      */
     IPage<TaVisitorAppointment> visitorAppointmentList(IPage pg, @Param("platNumber") String platNumber, @Param("personName")String personName, @Param("phone")String phone);
 
-    IPage<TaVisitorAppointment> getMyAppointmentList(IPage<TaVisitorAppointment> page,@Param("createUser") Integer personId, @Param("nameOrPhone") String nameOrPhone);
+    IPage<TaVisitorAppointment> getMyAppointmentList(IPage<TaVisitorAppointment> page,@Param("createUser") Integer personId, @Param("nameOrPhone") String nameOrPhone, @Param("identity") String identity);
 	
 	IPage<TaVisitorAppointment> getTodayAppointmentList(IPage<TaVisitorAppointment> page);
 	

src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java

@@ -31,7 +31,7 @@ public interface ITaVisitorAppointmentService extends IService<TaVisitorAppointm
 
     List<TaVisitorAppointment> getAppointmentsByPlateNumber(String plateNumber);
 
-    IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId, String nameOrPhone);
+    IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId, String nameOrPhone, String identity);
 	
 	IPage<TaVisitorAppointment> getTodayAppointmentList(int pageNum, int pageSize);
 	

src/main/java/com.huiju.welcome/service/impl/MessageServiceImpl.java

@@ -40,7 +40,7 @@ public class MessageServiceImpl implements IMessageService {
         // 同时增加渠道总
         List<String> identities = new ArrayList<String>(){{
             add(userIdentity);
-            add(CommConstant.IDENTITY_GENERAL_MANAGER);
+//            add(CommConstant.IDENTITY_GENERAL_MANAGER);
         }};
 
         // 推送给置业经理或者渠道经理 + 渠道总

src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java

@@ -90,7 +90,17 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
 
     @Override
     public Map<String, Object> getLastVisitInfo(Integer customerId) {
-        return taMainUsherRecordMapper.getSummaryOfCustomer(customerId);
+        Map<String, Object> summaryOfCustomer = taMainUsherRecordMapper.getSummaryOfCustomer(customerId);
+
+        Object o = summaryOfCustomer.get("visiteDate");
+        if (null != o) {
+            String visiteDate = summaryOfCustomer.get("visiteDate").toString().replace(".0", "");
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+            summaryOfCustomer.put("visiteDate", LocalDateTime.parse(visiteDate,df));
+        }
+
+        return summaryOfCustomer;
     }
 
     @Override
@@ -539,7 +549,7 @@ public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCusto
     public IPage<TaCustomer> getCustomerListOfFront(int pageNumber, int pageSize, Integer consultantId, String nameOrPhoneOrReceiver, String identity, Integer consultantType) {
         IPage<TaCustomer> page = new Page<>(pageNumber, pageSize);
 
-        String customerType = StringUtils.isEmpty(identity) ? null : ( CommConstant.IDENTITY_CONSULTANT_MANAGER.equals(identity) ? "normal" : CommConstant.CUSTOMER_OF_CHANNEL);
+        String customerType = StringUtils.isEmpty(identity) ? null : identity;
 
         return taCustomerMapper.getCustomerListOfFront(page, consultantId, nameOrPhoneOrReceiver, customerType, consultantType);
     }

src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java

@@ -67,9 +67,9 @@ public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppoin
     }
 
     @Override
-    public IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId, String nameOrPhone) {
+    public IPage<TaVisitorAppointment> getMyAppointmentList(int pageNum, int pageSize, Integer personId, String nameOrPhone, String identity) {
         IPage<TaVisitorAppointment> page = new Page<>(pageNum, pageSize);
-        IPage<TaVisitorAppointment> result = taVisitorAppointmentMapper.getMyAppointmentList(page, personId, nameOrPhone);
+        IPage<TaVisitorAppointment> result = taVisitorAppointmentMapper.getMyAppointmentList(page, personId, nameOrPhone, identity);
 
         return result;
     }

src/main/resources/mapper/TaVisitorAppointmentMapper.xml

@@ -34,12 +34,22 @@
 
     <select id="getMyAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
         SELECT
-            *
+            t.*,
+            s.username
         FROM
             ta_visitor_appointment t
+         JOIN sys_user s ON t.create_user = s.user_id
         WHERE
-            t.create_user = #{createUser}
-            AND t.status &gt; 0
+          t.status &gt; 0
+            <if test="null != createUser">
+                AND t.create_user = #{createUser}
+            </if>
+            <if test='null != identity and identity == "channel_manager"'>
+                AND s.user_identity = 'channel_manager'
+            </if>
+            <if test='null != identity and identity != "channel_manager"'>
+                AND s.user_identity in ('consultant', 'consultant_manager')
+            </if>
             <if test="nameOrPhone !=null and nameOrPhone !=''">
                 AND ( t.person_name LIKE CONCAT('%',#{nameOrPhone},'%') OR t.phone LIKE CONCAT('%',#{nameOrPhone},'%') )
             </if>