ddd

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcWorkLogDTO.java

@@ -101,4 +101,9 @@ public class IcWorkLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    /**
+     * 创建人名称
+     */
+    private String createdUser;
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcWorkLogController.java

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -74,6 +75,11 @@ public class IcWorkLogController {
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<IcWorkLogDTO> list = icWorkLogService.list(params);
+        if(CollectionUtils.isEmpty(list)){
+            IcWorkLogDTO dto = new IcWorkLogDTO();
+            dto.setId("");
+            list.add(dto);
+        }
         ExcelUtils.exportExcelToTarget(response, null, list, IcWorkLogExcel.class);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcWorkLogDao.java

@@ -1,9 +1,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcWorkLogDTO;
 import com.epmet.entity.IcWorkLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 网格员工作日志
  *
@@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IcWorkLogDao extends BaseDao<IcWorkLogEntity> {
-	
+
+    List<IcWorkLogDTO> listPage(Map<String, Object> params);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcWorkLogServiceImpl.java

@@ -1,14 +1,22 @@
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcWorkLogDao;
+import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.IcWorkLogDTO;
+import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.IcWorkLogEntity;
+import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.IcWorkLogRedis;
 import com.epmet.service.IcWorkLogService;
 import org.apache.commons.lang3.StringUtils;
@@ -32,12 +40,18 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Autowired
     private IcWorkLogRedis icWorkLogRedis;
 
+    @Autowired
+    private LoginUserUtil loginUserUtil;
+
+    @Autowired
+    private EpmetUserFeignClient epmetUserFeignClient;
+
+
     @Override
     public PageData<IcWorkLogDTO> page(Map<String, Object> params) {
-        IPage<IcWorkLogEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
+        params.put("customerId", loginUserUtil.getLoginUserCustomerId());
+        IPage<IcWorkLogDTO> page = getPage(params);
+        List<IcWorkLogDTO> list = baseDao.listPage(params);
         return getPageData(page, IcWorkLogDTO.class);
     }
 
@@ -66,6 +80,15 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcWorkLogDTO dto) {
+        //查询当前申请用户的基本信息
+        CustomerStaffDTO customerStaffParam = new CustomerStaffDTO();
+        customerStaffParam.setUserId(loginUserUtil.getLoginUserId());
+        Result<CustomerStaffDTO> staffInfo = epmetUserFeignClient.getCustomerStaffInfoByUserId(customerStaffParam);
+        if (!staffInfo.success() || null == staffInfo.getData()) {
+            logger.warn(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO)));
+        } else {
+            currentUserName = resultUserInfo.getData().getShowName();
+        }
         IcWorkLogEntity entity = ConvertUtils.sourceToTarget(dto, IcWorkLogEntity.class);
         insert(entity);
     }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcWorkLogDao.xml

@@ -24,4 +24,34 @@
     </resultMap>
 
 
+    <select id="listPage" resultType="com.epmet.dto.IcWorkLogDTO">
+        SELECT
+        *
+        FROM
+        ic_work_log wl
+        WHERE
+        wl.DEL_FLAG = '0'
+        AND wl.CUSTOMER_ID = #{customerId}
+        <if test="logType != null and logType != '' ">
+            AND wl.LOG_TYPE = #{logType}
+        </if>
+        <if test="createdUser != null and createdUser != '' ">
+            AND wl.created_user = #{createdUser}
+        </if>
+        <if test="gridId != null and gridId != '' ">
+            AND wl.GRID_ID = #{gridId}
+        </if>
+        <if test="agencyId != null and agencyId != '' ">
+            AND wl.AGENCY_ID = #{agencyId}
+        </if>
+        <if test="mobile != null and mobile != '' ">
+            AND wl.MOBILE = #{mobile}
+        </if>
+        <if test="startTime != null and startTime != '' ">
+            AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != '' ">
+            AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) &lt;= #{endTime}
+        </if>
+    </select>
 </mapper>