Merge remote-tracking branch 'origin/master'

hx-admin/src/main/resources/application-prod.yml

@@ -34,7 +34,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:28643/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: IzJshF_dk9NNFpNm_IK
-
+                purchase:
+                    url: jdbc:mysql://127.0.0.1:28643/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: IzJshF_dk9NNFpNm_IK
                 customer:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

hx-admin/src/main/resources/application-test.yml

@@ -46,7 +46,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
-
+                purchase:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
     # redis 配置
     redis:
         # 地址

hx-item/src/main/java/com/fjhx/item/entity/product/vo/ProductInfoVo.java

@@ -1,10 +1,11 @@
 package com.fjhx.item.entity.product.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 产品库列表查询返回值实体
  *
@@ -15,6 +16,8 @@ import lombok.Setter;
 @Setter
 public class ProductInfoVo extends ProductInfo {
 
-    @TableField(exist = false)
     private String classifyName;
+
+    private List<String> classifyNameGroup;
+
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -8,17 +8,25 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.entity.product.dto.ProductInfoDto;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
+import com.fjhx.item.entity.product.po.ProductClassify;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.mapper.product.ProductInfoMapper;
+import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.item.util.CodeEnum;
+import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 
 /**
@@ -33,6 +41,9 @@ import java.util.List;
 @Service
 public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, ProductInfo> implements ProductInfoService {
 
+    @Autowired
+    private ProductClassifyService productClassifyService;
+
     @Override
     public Page<ProductInfoVo> getPage(ProductInfoSelectDto dto) {
         IWrapper<ProductInfo> wrapper = getWrapper();
@@ -46,6 +57,36 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                 new SqlField("pi", ProductInfo::getCustomCode)
         );
         Page<ProductInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        List<ProductInfoVo> records = page.getRecords();
+
+        if (records.size() == 0) {
+            return page;
+        }
+
+        List<ProductClassify> productClassifyList = productClassifyService.list();
+        Map<Long, ProductClassify> productClassifyMap = productClassifyList.stream().collect(Collectors.toMap(BaseIdPo::getId, Function.identity()));
+
+        for (ProductInfoVo record : records) {
+            Long productClassifyId = record.getProductClassifyId();
+            ProductClassify productClassify = productClassifyMap.get(productClassifyId);
+            if (productClassify == null) {
+                continue;
+            }
+
+            record.setClassifyName(productClassify.getName());
+
+            List<String> classifyNameGroup = new ArrayList<>();
+
+            while (productClassify != null) {
+                classifyNameGroup.add(0, productClassify.getName());
+                productClassify = productClassifyMap.get(productClassify.getParentId());
+            }
+            record.setClassifyNameGroup(classifyNameGroup);
+
+        }
+
+
         return page;
     }
 

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -34,6 +34,7 @@
             </if>
         </where>
     </select>
+
     <select id="getListByProductType" resultType="com.fjhx.item.entity.product.vo.ProductInfoVo">
         SELECT
             t1.*,

hx-mail/src/main/java/com/fjhx/mail/controller/open/OpenController.java

@@ -0,0 +1,37 @@
+package com.fjhx.mail.controller.open;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.redis.RedisCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@DS(SourceConstant.ITEM)
+@RestController
+@RequestMapping("/open/mail")
+public class OpenController {
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /**
+     * 获取在线用户id
+     */
+    @GetMapping("/getOnlineUserIdList")
+    public Set<Long> getOnlineUserIdList() {
+        Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+        return keys.stream().map(key -> {
+            LoginUser user = redisCache.getCacheObject(key);
+            return user.getUserId();
+        }).collect(Collectors.toSet());
+    }
+
+}

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseMailbox.java

@@ -40,6 +40,11 @@ public class EnterpriseMailbox extends BasePo {
     private String mailPassword;
 
     /**
+     * 状态：1启用 0禁用
+     */
+    private Integer status;
+
+    /**
      * 同步邮件状态: 1同步 0不同步
      */
     private Integer syncStatus;

hx-mail/src/main/java/com/fjhx/mail/service/enterprise/impl/EnterpriseMailboxServiceImpl.java

@@ -9,6 +9,7 @@ import com.fjhx.mail.entity.enterprise.po.EnterpriseMailbox;
 import com.fjhx.mail.entity.enterprise.vo.EnterpriseMailboxVo;
 import com.fjhx.mail.mapper.enterprise.EnterpriseMailboxMapper;
 import com.fjhx.mail.service.enterprise.EnterpriseMailboxService;
+import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
@@ -55,6 +56,9 @@ public class EnterpriseMailboxServiceImpl extends ServiceImpl<EnterpriseMailboxM
 
     @Override
     public void add(EnterpriseMailboxDto enterpriseMailboxDto) {
+        enterpriseMailboxDto.setDefaultStatus(0);
+        enterpriseMailboxDto.setSyncStatus(1);
+        enterpriseMailboxDto.setStatus(StatusConstant.ENABLE);
         this.save(enterpriseMailboxDto);
     }
 

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionPlanServiceImpl.java

@@ -107,7 +107,9 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
         //赋值产品信息
         WorkOrder workOrder = workOrderService.getById(result.getWorkOrderId());
         ProductInfo productInfo = productInfoService.getById(workOrder.getProductId());
-        result.setProductName(productInfo.getName());
+        if(ObjectUtil.isNotEmpty(productInfo)) {
+            result.setProductName(productInfo.getName());
+        }
         //赋值生产任务列表
         List<ProductionTask> list = productionTaskService.list(q -> q.eq(ProductionTask::getProductionPlanId, id));
         List<ProductionTaskVo> productionTaskVos = BeanUtil.copyToList(list, ProductionTaskVo.class);

hx-oa/src/main/java/com/fjhx/oa/controller/netdisk/NetdiskController.java

@@ -0,0 +1,70 @@
+package com.fjhx.oa.controller.netdisk;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.netdisk.vo.NetdiskVo;
+import com.fjhx.oa.entity.netdisk.dto.NetdiskSelectDto;
+import com.fjhx.oa.entity.netdisk.dto.NetdiskDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.oa.service.netdisk.NetdiskService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 网盘 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+@RestController
+@RequestMapping("/netdisk")
+public class NetdiskController {
+
+    @Autowired
+    private NetdiskService netdiskService;
+
+    /**
+     * 网盘分页
+     */
+    @PostMapping("/page")
+    public Page<NetdiskVo> page(@RequestBody NetdiskSelectDto dto) {
+        return netdiskService.getPage(dto);
+    }
+
+    /**
+     * 网盘明细
+     */
+    @PostMapping("/detail")
+    public NetdiskVo detail(@RequestBody BaseSelectDto dto) {
+        return netdiskService.detail(dto.getId());
+    }
+
+    /**
+     * 网盘新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody NetdiskDto netdiskDto) {
+        netdiskService.add(netdiskDto);
+    }
+
+    /**
+     * 网盘编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody NetdiskDto netdiskDto) {
+        netdiskService.edit(netdiskDto);
+    }
+
+    /**
+     * 网盘删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody List<Long> ids) {
+        netdiskService.delete(ids);
+    }
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/contacts/dto/ContactsSelectDto.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class ContactsSelectDto extends BaseSelectDto {
 
+    /**
+     * 企业类型 1客户 2供应商 3自定义
+     */
+    private Integer enterpriseType;
+
 }

hx-oa/src/main/java/com/fjhx/oa/entity/daily/dto/DailyReportSelectDto.java

@@ -1,9 +1,12 @@
 package com.fjhx.oa.entity.daily.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 日报列表查询入参实体
  *
@@ -17,4 +20,11 @@ public class DailyReportSelectDto extends BaseSelectDto {
     /**发送者id*/
     private Long senderId;
 
+    /**日期过滤*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    private Date date;
+
+    /**过滤类型 1为我发出的日报 2为我收到的日报*/
+    private Integer type;
+
 }

hx-oa/src/main/java/com/fjhx/oa/entity/daily/vo/DailyReportVo.java

@@ -41,5 +41,9 @@ public class DailyReportVo extends DailyReport {
      * 今日发送日报的数量
      */
     private Long quantitySentToday;
+    /**周几*/
+    private Integer week;
+    /**创建日期*/
+    private String date;
 
 }

hx-oa/src/main/java/com/fjhx/oa/entity/netdisk/dto/NetdiskDto.java

@@ -0,0 +1,23 @@
+package com.fjhx.oa.entity.netdisk.dto;
+
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.oa.entity.netdisk.po.Netdisk;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 网盘新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+@Getter
+@Setter
+public class NetdiskDto extends Netdisk {
+
+    /**上传文件列表*/
+    List<ObsFile> fileList;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/netdisk/dto/NetdiskSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.oa.entity.netdisk.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 网盘列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+@Getter
+@Setter
+public class NetdiskSelectDto extends BaseSelectDto {
+
+    /**
+     * 父文件夹id
+     */
+    private Long parentFolderId;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/netdisk/po/Netdisk.java

@@ -0,0 +1,37 @@
+package com.fjhx.oa.entity.netdisk.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 网盘
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+@Getter
+@Setter
+@TableName("netdisk")
+public class Netdisk extends BasePo {
+
+    /**
+     * 类型 1为文件夹 2为文件
+     */
+    private Integer type;
+
+    /**
+     * 父文件夹id
+     */
+    private Long parentFolderId;
+
+    /**
+     * 文件/文件夹名称
+     */
+    private String name;
+
+}

hx-oa/src/main/java/com/fjhx/oa/entity/netdisk/vo/NetdiskVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.netdisk.vo;
+
+import com.fjhx.oa.entity.netdisk.po.Netdisk;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 网盘列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+@Getter
+@Setter
+public class NetdiskVo extends Netdisk {
+
+}

hx-oa/src/main/java/com/fjhx/oa/mapper/netdisk/NetdiskMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.oa.mapper.netdisk;
+
+import com.fjhx.oa.entity.netdisk.po.Netdisk;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.netdisk.vo.NetdiskVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 网盘 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+public interface NetdiskMapper extends BaseMapper<Netdisk> {
+
+    /**
+     * 网盘分页
+     */
+    Page<NetdiskVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Netdisk> wrapper);
+
+}

hx-oa/src/main/java/com/fjhx/oa/service/contacts/impl/ContactsServiceImpl.java

@@ -46,6 +46,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
     public Page<ContactsVo> getPage(ContactsSelectDto dto) {
         IWrapper<Contacts> wrapper = getWrapper();
         wrapper.orderByDesc("c", Contacts::getId);
+        wrapper.eq("c",Contacts::getEnterpriseType,dto.getEnterpriseType());
         if(ObjectUtil.isNotEmpty(dto.getKeyword())) {
             wrapper.and(q->q.like(Contacts::getContactName, dto.getKeyword())
                     .or()

hx-oa/src/main/java/com/fjhx/oa/service/daily/impl/DailyReportServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fjhx.oa.service.daily.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -41,20 +41,34 @@ import java.util.stream.Collectors;
 @DS(SourceConstant.OA)
 @Service
 public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, DailyReport> implements DailyReportService {
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
     @Autowired
     DailyReportDetailsService dailyReportDetailsService;
 
     @Override
     public Page<DailyReportVo> getPage(DailyReportSelectDto dto) {
         IWrapper<DailyReport> wrapper = getWrapper();
-        wrapper.orderByDesc("dr", DailyReport::getId);
+        wrapper.orderByDesc("date");
         Long userid = SecurityUtils.getUserId();
-        wrapper.eq("drd",DailyReportDetails::getRecipientId,userid);
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getSenderId()),"dr.create_user",dto.getSenderId());
-        if(ObjectUtil.isNotEmpty(dto.getKeyword())){
-            wrapper.and(wrapper1->wrapper1.like(DailyReport::getCompletedWork,dto.getKeyword())
-                    .or().like(DailyReport::getUnfinishedWork,dto.getKeyword())
-                    .or().like(DailyReport::getIsVisibleToRecipient,dto.getKeyword()));
+        wrapper.eq("drd", DailyReportDetails::getRecipientId, userid);
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getSenderId()), "dr.create_user", dto.getSenderId());
+        if(ObjectUtil.isNotEmpty(dto.getDate())) {
+            wrapper.apply("date_format(dr.create_time,'%Y-%m-%d') = date_format('" + sdf.format(dto.getDate()) + "','%Y-%m-%d')");
+        }
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            wrapper.and(wrapper1 -> wrapper1.like(DailyReport::getCompletedWork, dto.getKeyword())
+                    .or().like(DailyReport::getUnfinishedWork, dto.getKeyword())
+                    .or().like(DailyReport::getIsVisibleToRecipient, dto.getKeyword()));
+        }
+        if(ObjectUtil.isNotEmpty(dto.getType())) {
+            if (dto.getType() == 1) {
+                //过滤我发出的日报
+                wrapper.eq("dr.create_user", userid);
+            } else if (dto.getType() == 2) {
+                //过滤我收到的日报
+                wrapper.ne("dr.create_user", userid);
+            }
         }
         Page<DailyReportVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         UserUtil.assignmentNickName(page.getRecords(), DailyReport::getCreateUser, DailyReportVo::setUserName);
@@ -69,7 +83,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         //添加已读记录
         Long userid = SecurityUtils.getUserId();
         DailyReportDetails dailyReportDetails = dailyReportDetailsService.getOne(q -> q.eq(DailyReportDetails::getDailyReportId, id).eq(DailyReportDetails::getRecipientId, userid));
-        if(ObjectUtil.isNotEmpty(dailyReportDetails)) {
+        if (ObjectUtil.isNotEmpty(dailyReportDetails)) {
             dailyReportDetails.setIsRead(1);
             dailyReportDetailsService.updateById(dailyReportDetails);
         }
@@ -134,7 +148,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         long receivedQuantity = dailyReportDetailsService.count(q -> q.eq(DailyReportDetails::getRecipientId, SecurityUtils.getUserId()));
         IWrapper<DailyReport> wrapper = getWrapper();
         wrapper.eq(DailyReport::getCreateUser, SecurityUtils.getUserId());
-        wrapper.eq("(date( create_time ) = curdate())",1);
+        wrapper.eq("(date( create_time ) = curdate())", 1);
         long quantitySentToday = count(wrapper);
         DailyReportVo dailyReportVo = new DailyReportVo();
         dailyReportVo.setQuantitySent(quantitySent);
@@ -148,7 +162,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         String username = SecurityUtils.getUsername();
         Map<String, Object> msgMap = new HashMap<>();
         msgMap.put("businessId", id);
-        msgMap.put("msg", String.format("%s给你分享了日报",username));
+        msgMap.put("msg", String.format("%s给你分享了日报", username));
         WebSocketServer.sendInfo(toUserId, 1, msgMap);
     }
 

hx-oa/src/main/java/com/fjhx/oa/service/netdisk/NetdiskService.java

@@ -0,0 +1,48 @@
+package com.fjhx.oa.service.netdisk;
+
+import com.fjhx.oa.entity.netdisk.po.Netdisk;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.netdisk.vo.NetdiskVo;
+import com.fjhx.oa.entity.netdisk.dto.NetdiskSelectDto;
+import com.fjhx.oa.entity.netdisk.dto.NetdiskDto;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 网盘 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-07
+ */
+public interface NetdiskService extends BaseService<Netdisk> {
+
+    /**
+     * 网盘分页
+     */
+    Page<NetdiskVo> getPage(NetdiskSelectDto dto);
+
+    /**
+     * 网盘明细
+     */
+    NetdiskVo detail(Long id);
+
+    /**
+     * 网盘新增
+     */
+    void add(NetdiskDto netdiskDto);
+
+    /**
+     * 网盘编辑
+     */
+    void edit(NetdiskDto netdiskDto);
+
+    /**
+     * 网盘删除
+     */
+    void delete(List<Long> ids);
+
+}

hx-oa/src/main/java/com/fjhx/oa/service/netdisk/impl/NetdiskServiceImpl.java

@@ -0,0 +1,136 @@
+package com.fjhx.oa.service.netdisk.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.file.entity.FileInfo;
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.file.service.FileInfoService;
+import com.fjhx.oa.entity.netdisk.dto.NetdiskDto;
+import com.fjhx.oa.entity.netdisk.dto.NetdiskSelectDto;
+import com.fjhx.oa.entity.netdisk.po.Netdisk;
+import com.fjhx.oa.entity.netdisk.vo.NetdiskVo;
+import com.fjhx.oa.mapper.netdisk.NetdiskMapper;
+import com.fjhx.oa.service.netdisk.NetdiskService;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import io.seata.spring.annotation.GlobalTransactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 网盘 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-07
+ */
+@DS(SourceConstant.OA)
+@Service
+public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> implements NetdiskService {
+
+    @Autowired
+    FileInfoService fileInfoService;
+
+    @Override
+    public Page<NetdiskVo> getPage(NetdiskSelectDto dto) {
+        IWrapper<Netdisk> wrapper = getWrapper();
+        wrapper.orderByDesc("n", Netdisk::getId);
+        if (ObjectUtil.isEmpty(dto.getParentFolderId())) {
+            wrapper.eq(Netdisk::getParentFolderId, "-1");
+        } else {
+            wrapper.eq(Netdisk::getParentFolderId, dto.getParentFolderId());
+        }
+        wrapper.like(Netdisk::getName, dto.getKeyword());
+        Page<NetdiskVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public NetdiskVo detail(Long id) {
+        Netdisk Netdisk = this.getById(id);
+        NetdiskVo result = BeanUtil.toBean(Netdisk, NetdiskVo.class);
+        return result;
+    }
+
+
+    @GlobalTransactional
+    @Override
+    public void add(NetdiskDto netdiskDto) {
+        //如果父文件夹id为空就赋值初始值-1
+        if(ObjectUtil.isEmpty(netdiskDto.getParentFolderId())){
+            netdiskDto.setParentFolderId(-1l);
+        }
+        if (netdiskDto.getType() == 1) {
+            //如果是文件夹，直接创建
+            this.save(netdiskDto);
+        } else {
+            //如果是文件，根据列表创建文件记录
+            List<Netdisk> netdiskList = new ArrayList<>();
+            List<FileInfo> fileInfoList = new ArrayList<>();
+
+            List<ObsFile> fileList = netdiskDto.getFileList();
+            for (ObsFile obsFile : fileList) {
+                //保存网盘信息
+                long id = IdWorker.getId();
+                Netdisk netdisk = new Netdisk();
+                netdisk.setId(id);
+                netdisk.setType(netdiskDto.getType());
+                netdisk.setParentFolderId(netdiskDto.getParentFolderId());
+                netdisk.setName(obsFile.getFileName());
+                netdiskList.add(netdisk);
+                //更新文件信息
+                FileInfo fileInfo = new FileInfo();
+                fileInfo.setId(obsFile.getId());
+                fileInfo.setBusinessId(id);
+                fileInfo.setBusinessType(0);
+                fileInfoList.add(fileInfo);
+            }
+
+            DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+            fileInfoService.updateBatchById(fileInfoList);
+            DynamicDataSourceContextHolder.poll();
+            saveBatch(netdiskList);
+        }
+    }
+
+    @GlobalTransactional
+    @Override
+    public void edit(NetdiskDto netdiskDto) {
+        this.updateById(netdiskDto);
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        FileInfo fileInfo = fileInfoService.getOne(q -> q.eq(FileInfo::getBusinessId, netdiskDto.getId()));
+        if (ObjectUtil.isNotEmpty(fileInfo)) {
+            fileInfo.setFileName(netdiskDto.getName());
+            fileInfoService.updateById(fileInfo);
+        }else{
+            throw new ServiceException("文件信息不存在");
+        }
+        DynamicDataSourceContextHolder.poll();
+    }
+
+    @GlobalTransactional
+    @Override
+    public void delete(List<Long> ids) {
+        this.removeBatchByIds(ids);
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        List<FileInfo> list = fileInfoService.list(q -> q.in(FileInfo::getBusinessId, ids));
+        if(ObjectUtil.isNotEmpty(list)) {
+            List<Long> fids = list.stream().map(FileInfo::getId).collect(Collectors.toList());
+            fileInfoService.removeBatchByIds(fids);
+        }
+        DynamicDataSourceContextHolder.poll();
+    }
+
+}

hx-oa/src/main/resources/mapper/daily/DailyReportMapper.xml

@@ -12,7 +12,9 @@
             dr.create_time,
             dr.update_user,
             dr.update_time,
-            drd.is_read
+            drd.is_read,
+            WEEKDAY(dr.create_time)+1 `week`,
+            date_format(dr.create_time,'%Y-%m-%d') `date`
         FROM
             daily_report dr
                 JOIN daily_report_details drd ON drd.daily_report_id = dr.id

hx-oa/src/main/resources/mapper/netdisk/NetdiskMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.oa.mapper.netdisk.NetdiskMapper">
+    <select id="getPage" resultType="com.fjhx.oa.entity.netdisk.vo.NetdiskVo">
+        select
+            n.id,
+            n.type,
+            n.parent_folder_id,
+            n.name,
+            n.create_user,
+            n.create_time,
+            n.update_user,
+            n.update_time
+        from netdisk n
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-purchase/pom.xml

@@ -29,6 +29,10 @@
             <artifactId>hx-item</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-supply</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseDetailController.java

@@ -1,5 +1,7 @@
 package com.fjhx.purchase.controller.purchase;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author 
  * @since 2023-04-06
  */
+@DS(SourceConstant.PURCHASE)
 @RestController
 @RequestMapping("/purchaseDetail")
 public class PurchaseDetailController {

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/Purchase.java

@@ -58,6 +58,17 @@ public class Purchase extends BasePo {
     private Integer purchaseStatus;
 
     /**
+     * 付款状态 0未付款  10部分付款  20已付款
+     */
+    private Integer payStatus;
+
+    /**
+     * 到货状态 0未到货  10 部分到货  20已到货
+     */
+    private Integer arrivalStatus;
+
+
+    /**
      * 审核通过时间
      */
     private Date approvedDate;

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/PurchaseDetail.java

@@ -42,6 +42,16 @@ public class PurchaseDetail extends BasePo {
     private BigDecimal count;
 
     /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 总价
+     */
+    private BigDecimal amount;
+
+    /**
      * 采购事由
      */
     private String content;

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchaseVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.purchase.entity.purchase.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,4 +15,5 @@ import lombok.Setter;
 @Setter
 public class PurchaseVo extends Purchase {
 
+    private String supplyName;
 }

hx-purchase/src/main/java/com/fjhx/purchase/flow/PurchaseFlow.java

@@ -2,9 +2,11 @@ package com.fjhx.purchase.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
@@ -31,6 +33,7 @@ import java.util.List;
  * @Author:caozj
  * @DATE:2023/4/3 17:38
  */
+@DS(SourceConstant.PURCHASE)
 @Component
 public class PurchaseFlow extends FlowDelegate {
 

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -2,9 +2,11 @@ package com.fjhx.purchase.flow;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
@@ -24,6 +26,7 @@ import java.util.List;
  * @Author:caozj
  * @DATE:2023/4/3 17:38
  */
+@DS(SourceConstant.PURCHASE)
 @Component
 public class SubscribeFlow extends FlowDelegate {
 

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseDetailServiceImpl.java

@@ -1,5 +1,7 @@
 package com.fjhx.purchase.service.purchase.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.mapper.purchase.PurchaseDetailMapper;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
@@ -22,6 +24,7 @@ import cn.hutool.core.bean.BeanUtil;
  * @author 
  * @since 2023-04-06
  */
+@DS(SourceConstant.PURCHASE)
 @Service
 public class PurchaseDetailServiceImpl extends ServiceImpl<PurchaseDetailMapper, PurchaseDetail> implements PurchaseDetailService {
 

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -1,7 +1,10 @@
 package com.fjhx.purchase.service.purchase.impl;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
@@ -10,7 +13,11 @@ import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.purchase.util.code.CodeEnum;
+import com.fjhx.supply.entity.supplier.po.SupplierInfo;
+import com.fjhx.supply.service.supplier.SupplierInfoService;
 import io.seata.spring.annotation.GlobalTransactional;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
@@ -19,6 +26,10 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * <p>
@@ -28,14 +39,35 @@ import cn.hutool.core.bean.BeanUtil;
  * @author 
  * @since 2023-04-06
  */
+@DS(SourceConstant.PURCHASE)
 @Service
 public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> implements PurchaseService {
 
+    @Autowired
+    private SupplierInfoService supplierInfoService;
+
+    /**
+     * 列表
+     * @param dto
+     * @return
+     */
     @Override
     public Page<PurchaseVo> getPage(PurchaseSelectDto dto) {
         IWrapper<Purchase> wrapper = getWrapper();
         wrapper.orderByDesc("p", Purchase::getId);
         Page<PurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<PurchaseVo> list = page.getRecords();
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Long> supplyIds = list.stream().map(PurchaseVo::getSupplyId).collect(Collectors.toList());
+            List<SupplierInfo> supplierInfoList = supplierInfoService.list(Wrappers.<SupplierInfo>query().lambda().in(SupplierInfo::getId,supplyIds));
+            Map<Long,List<SupplierInfo>> supplyMap = supplierInfoList.stream().distinct().collect(Collectors.groupingBy(SupplierInfo::getId));
+            if(MapUtils.isNotEmpty(supplyMap)){
+                for(PurchaseVo p:list){
+                    List<SupplierInfo> supplys = supplyMap.getOrDefault(p.getSupplyId(),null);
+                    p.setSupplyName(supplys==null?null:supplys.get(0).getName());
+                }
+            }
+        }
         return page;
     }
 

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -1,8 +1,10 @@
 package com.fjhx.purchase.service.subscribe.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
@@ -33,6 +35,7 @@ import java.util.stream.Collectors;
  * @author 
  * @since 2023-04-03
  */
+@DS(SourceConstant.PURCHASE)
 @Service
 public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMapper, SubscribeDetail> implements SubscribeDetailService {
 

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -1,9 +1,11 @@
 package com.fjhx.purchase.service.subscribe.impl;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
@@ -38,6 +40,7 @@ import java.util.stream.Collectors;
  * @author 
  * @since 2023-04-03
  */
+@DS(SourceConstant.PURCHASE)
 @Service
 public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe> implements SubscribeService {
 

hx-purchase/src/main/resources/mapper/purchase/PurchaseMapper.xml

@@ -4,7 +4,6 @@
     <select id="getPage" resultType="com.fjhx.purchase.entity.purchase.vo.PurchaseVo">
         select
             p.id,
-            p.subscribe_detail_id,
             p.dept_name,
             p.purchase_name,
             p.purchase_time,

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -1,9 +1,11 @@
 package com.fjhx.supply.service.supplier.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.utils.AreaUtil;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.supply.entity.supplier.dto.SupplierInfoDto;
 import com.fjhx.supply.entity.supplier.dto.SupplierInfoSelectDto;
@@ -27,6 +29,7 @@ import java.util.List;
  * @author
  * @since 2023-03-17
  */
+@DS(SourceConstant.SUPPLY)
 @Service
 public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, SupplierInfo> implements SupplierInfoService {
 

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierPriceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.supply.service.supplier.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
  * @author zlj
  * @since 2023-03-17
  */
+@DS(SourceConstant.SUPPLY)
 @Service
 public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, SupplierPrice> implements SupplierPriceService {