物资管理修改，我的待办查询修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/mapper/xml/CollectDetailedMapper.xml

@@ -2,13 +2,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeeplus.test.materialManagement.collect.mapper.CollectDetailedMapper">
     <select id="getByBasicId" resultType="com.jeeplus.test.materialManagement.collect.domain.CollectDetailed">
-        select a.*,su.name as recipientAgent,su.id as recipientAgentId,
-        so.name as recipientOffice,d.id as collectTypeId, d.name as collectType
-        from material_management_collect_detailed a
-        left join sys_user su on a.recipient_agent = su.id
-        left join sys_office so on su.office_id = so.id
-        left join material_management_type d on a.collect_type = d.id
-        where a.basic_id = #{basicId} and a.del_flag = '0'
+            SELECT
+        a.*,
+        su.NAME AS recipientAgent,
+        su.id AS recipientAgentId,
+        so.NAME AS recipientOffice,
+        d.id AS collectTypeId,
+        d.NAME AS collectType,
+        sum(test2.tradeNumber) as surplusNumber
+    FROM
+        material_management_collect_detailed a
+        LEFT JOIN sys_user su ON a.recipient_agent = su.id
+        LEFT JOIN sys_office so ON su.office_id = so.id
+        LEFT JOIN material_management_type d ON a.collect_type = d.id
+        LEFT JOIN (
+            SELECT
+                a.ware_house_type,
+                a.trade_name,
+                IFNULL((sum(trade_number) - collect_number),sum(trade_number)) as tradeNumber
+            FROM
+                material_management_warehouse_detailed a
+                left join
+                (select sum(collect_number) as collect_number,goods_name,status from material_management_collect_detailed e
+                left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0
+                WHERE f.`status` = 5
+                GROUP BY e.goods_name) b
+                on a.trade_name = b.goods_name
+
+                LEFT JOIN material_management_warehouse_basics bas on a.basic_id = bas.id
+                left join material_management_type c on a.ware_house_type = c.id
+                GROUP BY a.trade_name
+        ) test2 on a.collect_type = test2.ware_house_type
+    WHERE
+        a.basic_id = #{id} and a.del_flag = '0'
     </select>
     <select id="getByAttachmentId" resultType="com.jeeplus.test.workContract.service.dto.WorkAttachmentDto">
         SELECT

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/service/CollectService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.service.MyNoticeService;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.Exceptions;
 import com.jeeplus.sys.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jeeplus.sys.utils.UserUtils;
@@ -117,7 +118,7 @@ public class CollectService {
         info.setUpdateBy(userDTO.getId());
         info.setHandledBy(dto.getHandledById());
         info.setUpdateDate(new Date());
-//        basicMapper.updateById(info);
+        basicMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据
 //        LambdaQueryWrapper<MaterialDetailed> detailWrapper = new LambdaQueryWrapper<>();
@@ -200,18 +201,25 @@ public class CollectService {
                                 String day = format.format(new Date());
                                 String title = userDTO.getLoginName() + " 在 " + day + " 发起了 [库存提醒]";
                                 //向多个用户发起通知 徐珊、黄丽、杨娟、崇祝燕
-                                String[] names = {"徐珊","黄丽","杨娟","崇祝燕"};
-                                List<UserDTO> usersInfo = wareHouseDetailedMapper.getUsersInfo(names);
+//                                String[] names = {"徐珊","黄丽","杨娟","崇祝燕"};
+
+                                List<UserDTO> usersInfo = wareHouseDetailedMapper.getUsersInfo();
                                 //获取目前领用流程的taskid，根据procInsId去查taskId
+                                String uuid = "";
                                 if (null != usersInfo) {
-                                    usersInfo.forEach(us->{
-                                        try {
-                                            //发送通知
-                                            myNoticeService.add("cs", title, "", "库存提醒", userDTO.getLoginName(), day,us.getLoginName(), us.getId());
-                                        } catch (Exception e) {
-                                            e.printStackTrace();
-                                        }
-                                    });
+                                    for (UserDTO userDTO1 : usersInfo) {
+                                        uuid = UUID.randomUUID().toString();
+                                        //发送通知
+                                        myNoticeService.add(uuid, title, "", "库存提醒", userDTO.getLoginName(), day,userDTO1.getLoginName(), userDTO1.getId());
+                                    }
+//                                    usersInfo.forEach(us->{
+//
+//                                        try {
+//
+//                                        } catch (Exception e) {
+//                                            e.printStackTrace();
+//                                        }
+//                                    });
                                 }
 //                                myNoticeService.add("", title, "", "库存提醒", userDTO.getLoginName(), day,"程倩", "1613087772650008578");
                             }
@@ -222,7 +230,7 @@ public class CollectService {
             }
 
         }
-        basicMapper.updateById(info);
+//        basicMapper.updateById(info);
         // 修改附件信息列表
         if (CollectionUtils.isNotEmpty(dto.getFiles())) {
             infoService.updateFiles(dto.getFiles(), userDTO, dto.getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/materialType/service/MaterialTypeForTreeDataService.java

@@ -35,7 +35,7 @@ public class MaterialTypeForTreeDataService extends TreeService<MaterialTypeMapp
     public List<MaterialTypeInfo> treeDataForType(String extId, String type) throws Exception{
         //获取所有的业务类型为1的数据
 //        List<CwReimbursementTypeInfo> allList = typeMapper.getAllList("1");
-        List<MaterialTypeInfo> allList = typeMapper.findList (new LambdaQueryWrapper<>( (Class <MaterialTypeInfo>) entityClass ).orderByAsc ( MaterialTypeInfo::getSort ));
+        List<MaterialTypeInfo> allList = typeMapper.findList (new LambdaQueryWrapper<>( (Class <MaterialTypeInfo>) entityClass ).eq(MaterialTypeInfo::getDelFlag, 0).orderByAsc ( MaterialTypeInfo::getSort ));
         MaterialTypeInfo root = entityClass.getConstructor ( ).newInstance ( );
         root.setId ( TreeDTO.getRootId () );
         List <MaterialTypeInfo> rootTree = this.formatListToTreeForType ( root, allList, extId, type );

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/WareHouseDetailedMapper.java

@@ -26,8 +26,8 @@ public interface WareHouseDetailedMapper extends BaseMapper<WareHouseDetailed> {
 
     /**
      * 根据登陆名称查去用户信息
-     * @param names
+     * @param
      * @return
      */
-    List<UserDTO> getUsersInfo(String[] names);
+    List<UserDTO> getUsersInfo();
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseDetailedMapper.xml

@@ -29,9 +29,6 @@
         select a.id from material_management_warehouse_detailed a where a.basic_id = #{id} and a.del_flag = 0
     </select>
     <select id="getUsersInfo" resultType="com.jeeplus.sys.service.dto.UserDTO">
-        select a.id,a.login_name from sys_user a where login_name in
-        <foreach collection="names" open="(" separator="," close=")" item="name">
-            #{name}
-        </foreach>
+        select a.user_id as id,a.user_name as loginName  from material_user a
     </select>
 </mapper>

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -124,6 +124,9 @@ public class FlowTaskService {
         if (StrUtil.isNotBlank (flow.getTitle ())) {
             todoTaskQuery.processVariableValueLike ( FlowableConstant.TITLE, "%" + flow.getTitle () + "%");
         }
+        if (StringUtils.isNotEmpty(flow.getAssigneeName())) {
+            todoTaskQuery.processVariableValueLike ( FlowableConstant.USERNAME, "%" + flow.getAssigneeName() + "%");
+        }
 
 
         long total = todoTaskQuery.count ( );