导出

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java

@@ -28,6 +28,7 @@ public enum DictTypeEnum {
     IC_SERVICE_TYPE("ic_service_type","服务类别",20),
     IC_DANGER_TYPE("ic_danger_type","危化品种类",24),
     POLICY_LEVEL("policy_level","政策级别",25),
+    LOG_TYPE("log_type", "日志类型", 33),
     ;
 
     private final String code;

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

@@ -33,6 +33,11 @@ public class IcWorkLogDTO implements Serializable {
      */
 	private String agencyId;
 
+    /**
+     * 组织Id
+     */
+    private String allAgencyName;
+
     /**
      * agency_id的所有上级
      */
@@ -43,6 +48,11 @@ public class IcWorkLogDTO implements Serializable {
      */
 	private String gridId;
 
+    /**
+     * 网格Id【场所区域】
+     */
+    private String gridName;
+
     /**
      * 标题
      */

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

@@ -74,7 +74,7 @@ public class IcWorkLogController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcWorkLogDTO> list = icWorkLogService.list(params);
+        List<IcWorkLogDTO> list = icWorkLogService.list4Export(params);
         if(CollectionUtils.isEmpty(list)){
             IcWorkLogDTO dto = new IcWorkLogDTO();
             dto.setId("");

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

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface IcWorkLogDao extends BaseDao<IcWorkLogEntity> {
 
     List<IcWorkLogDTO> listPage(Map<String, Object> params);
+
+    List<IcWorkLogDTO> list4Export(Map<String, Object> params);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcWorkLogExcel.java

@@ -14,56 +14,34 @@ import java.util.Date;
 @Data
 public class IcWorkLogExcel {
 
-    @Excel(name = "唯一标识")
-    private String id;
+    @Excel(name = "网格员")
+    private String createdUser;
 
-    @Excel(name = "客户Id")
-    private String customerId;
-
-    @Excel(name = "组织Id")
-    private String agencyId;
+    @Excel(name = "联系电话")
+    private String mobile;
 
-    @Excel(name = "agency_id的所有上级")
-    private String pids;
+    @Excel(name = "所属镇街")
+    private String allAgencyName;
 
-    @Excel(name = "网格Id【场所区域】")
-    private String gridId;
+    @Excel(name = "所属网格")
+    private String gridName;
 
     @Excel(name = "标题")
     private String title;
 
-    @Excel(name = "日志类型【admin库sys_dict_data表value值】")
-    private String logType;
-
-    @Excel(name = "日志日期")
+    @Excel(name = "日志时间")
     private String logDate;
 
+    @Excel(name = "日志类型")
+    private String logType;
+
     @Excel(name = "内容")
     private String content;
 
     @Excel(name = "备注")
     private String remark;
 
-    @Excel(name = "手机")
-    private String mobile;
-
-    @Excel(name = "删除标识：0.未删除 1.已删除")
-    private Integer delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
+    @Excel(name = "照片")
+    private String url;
 
 }

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

@@ -36,6 +36,16 @@ public interface IcWorkLogService extends BaseService<IcWorkLogEntity> {
      */
     List<IcWorkLogDTO> list(Map<String, Object> params);
 
+    /**
+     * 查询
+     *
+     * @param params
+     * @return java.util.List<IcWorkLogDTO>
+     * @author generator
+     * @date 2022-08-05
+     */
+    List<IcWorkLogDTO> list4Export(Map<String, Object> params);
+
     /**
      * 单条查询
      *

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

@@ -6,6 +6,7 @@ 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.NumConstant;
+import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -20,6 +21,7 @@ import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.entity.IcWorkLogEntity;
 import com.epmet.entity.IcWorkLogFileEntity;
+import com.epmet.feign.EpmetAdminOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.IcWorkLogRedis;
 import com.epmet.service.IcWorkLogFileService;
@@ -56,6 +58,9 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
 
+    @Autowired
+    private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
+
     @Resource
     private CustomerGridDao customerGridDao;
 
@@ -75,6 +80,20 @@ public class IcWorkLogServiceImpl extends BaseServiceImpl<IcWorkLogDao, IcWorkLo
         return ConvertUtils.sourceToTarget(entityList, IcWorkLogDTO.class);
     }
 
+    @Override
+    public List<IcWorkLogDTO> list4Export(Map<String, Object> params) {
+        List<IcWorkLogDTO> list = baseDao.list4Export(params)
+        Result<Map<String, String>> result = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.LOG_TYPE.getCode());
+        if (!result.success() || null == result.getData()) {
+            throw new EpmetException("查询字典信息失败" + JSON.toJSONString(result));
+        } else {
+            Map<String, String> logTypeMap = result.getData();
+            list.forEach(item -> item.setLogType(logTypeMap.get(item.getLogType())));
+        }
+
+        return list;
+    }
+
     private QueryWrapper<IcWorkLogEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
 

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

@@ -54,4 +54,49 @@
             AND DATE_FORMAT( wl.CREATED_TIME, '%Y-%m-%d' ) <= #{endTime}
         </if>
     </select>
+
+    <select id="list4Export" resultType="com.epmet.dto.IcWorkLogDTO">
+        SELECT
+        wl.CREATED_USER,
+        wl.MOBILE,
+        CONCAT( a.ALL_PARENT_NAME, '-', a.ORGANIZATION_NAME ) AS allAgencyName,
+        g.GRID_NAME,
+        wl.TITLE,
+        wl.LOG_DATE,
+        wl.LOG_TYPE,
+        wl.CONTENT,
+        wl.REMARK,
+        GROUP_CONCAT( f.URL ) AS url
+        FROM
+        ic_work_log wl
+        LEFT JOIN customer_grid g ON wl.GRID_ID = g.id
+        LEFT JOIN customer_agency a ON wl.AGENCY_ID = a.id
+        LEFT JOIN ic_work_log_file f ON f.LOG_ID = wl.id
+        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>
+        GROUP BY
+        wl.id
+    </select>
 </mapper>