修改

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -66,6 +66,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -166,6 +167,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
      * @param dto 数据传输对象
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean saveApp(AppBusSalesOrderModelDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String salesOrderSid = dto.getSaleOrderSid();

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -1933,6 +1933,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         Page<FlowTaskDto> page = new Page<>();
         TaskQuery taskQuery = taskService.createTaskQuery();
         String names = "";
+        String startUserSidParams = "";
         // 流程参数
         Map<String, Object> paramMap = new HashMap<>();
         // 挂载表单参数
@@ -1950,6 +1951,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                         }
                     }
                 }
+                //发起人姓名查询
+                if("startUserSid".equals(btq.getField())){
+                    startUserSidParams = btq.getValue();
+                }
             }
             if("proDefName".equals(btq.getField())){
                 names = btq.getValue();
@@ -1965,6 +1970,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             or.or();
             or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
             or.endOr();
+        }
+        if(StringUtils.isNotBlank(startUserSidParams)){
+            or.taskVariableValueLike("INITIATOR", "%" + startUserSidParams + "%");
         }
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoQuery.java

@@ -22,4 +22,9 @@ public class FlowTaskDoQuery implements Query {
 
     @ApiModelProperty("组织机构sid")
     private String orgPath;
+    @ApiModelProperty("日期至日期")
+    private String date;
+    @ApiModelProperty("用户sid")
+    private String createUser;
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 public class PcSysStaffQuery implements Query {
     private static final long serialVersionUID = 1858291601540877140L;
-    @ApiModelProperty(value = "业务员sid")
+    @ApiModelProperty(value = "业务员sid",required = false)
     private String staffSid;
 
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.portal.api.sysstaffinfo;
 
 import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,7 +12,8 @@ import lombok.Data;
 @Data
 public class PcSysStaffVo implements Vo {
     private static final long serialVersionUID = -9042032921079833819L;
-
+    @ApiModelProperty("用户sid")
-    private String staffSid;
+    private String userSid;
+    @ApiModelProperty("人员")
     private String staffName;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@@ -94,7 +94,7 @@ public interface SysStaffinfoFeign {
      */
     @ApiOperation("获取集团内全部员工姓名")
     @GetMapping("/getStaffName")
-    public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid);
+    public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid);
 
     /**
      * 获取部门内全部员工姓名
@@ -145,5 +145,13 @@ public interface SysStaffinfoFeign {
     @ApiOperation("切换机构：存放地点变更-获取人员列表")
     @ResponseBody
     @GetMapping("/getGressionUserList")
-    ResultBean<List<AppSysStaffVo>> getGressionUserList(@RequestParam("userSid")String userSid,@RequestParam("orgPath")String orgPath);
+    ResultBean<List<AppSysStaffVo>> getGressionUserList(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
+
+    @ApiOperation("获取集团所有人员")
+    @ResponseBody
+    @GetMapping("/selectStaffLists")
+    ResultBean<List<PcSysStaffVo>> selectStaffLists();
+
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -103,4 +103,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        return null;
+    }
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java

@@ -24,4 +24,7 @@ public class AppSysStaffQuery implements Query {
 
     @ApiModelProperty("已选人员sid")
     private List<String> selectSid;
+
+    @ApiModelProperty("state：1是所有，0是本分公司")
+    private int state;
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -255,4 +255,5 @@ public interface SysUserFeign {
     @ApiOperation(value = "分享时查询的人员")
     @PostMapping(value = "/shareSelectUser")
     ResultBean<List<String>> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery);
+
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -486,6 +486,36 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        //发起日期查询
+        String date = params.getDate();
+        if(StringUtils.isNotBlank(date)){
+            String[] s = date.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("startDate");
+                taskParam.setValue(startDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
+                taskParamList.add(taskParam);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("endDate");
+                taskParam.setValue(endDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
+                taskParamList.add(taskParam);
+            }
+        }
+
+        if(StringUtils.isNotBlank(params.getCreateUser())){
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField("startUserSid");
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue(params.getCreateUser());
+            taskParamList.add(taskParam);
+        }
+
       /*  if (StringUtils.isNotBlank(orgPath)) {//切换机构
             BusinessTaskParam taskParam = new BusinessTaskParam();
             taskParam.setField(BusinessVariables.ORGPATH);
@@ -585,6 +615,33 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        String date = params.getDate();
+        if(StringUtils.isNotBlank(date)){
+            String[] s = date.split("至");
+            String startDate = s[0];
+            if (StringUtils.isNotBlank(startDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("startDate");
+                taskParam.setValue(startDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.GE);
+                taskParamList.add(taskParam);
+            }
+            String endDate = s[1];
+            if (StringUtils.isNotBlank(endDate)) {
+                BusinessTaskParam taskParam = new BusinessTaskParam();
+                taskParam.setField("endDate");
+                taskParam.setValue(endDate);
+                taskParam.setSqlOperationSymbol(SQLOperationSymbol.LE);
+                taskParamList.add(taskParam);
+            }
+        }
+        if(StringUtils.isNotBlank(params.getCreateUser())){
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField("startUserSid");
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue(params.getCreateUser());
+            taskParamList.add(taskParam);
+        }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessDoneListForApp(userSid, taskQueryPagerQuery);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@@ -122,4 +122,6 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
     IPage<AppSysStaffVo> getUserList(IPage<SysStaffinfo> page, @Param(Constants.WRAPPER) QueryWrapper<AppSysStaffVo> qw, @Param("orgSid") String orgSid);
 
     List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
+
+    List<PcSysStaffVo> selectStaffLists();
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -309,9 +309,10 @@
     </update>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
-        select sso.staffSid, si.name staffName
+        select su.sid userSid, si.name staffName
         from sys_staff_org sso
                  left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on su.staffSid = si.sid
         where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
     </select>
 
@@ -377,4 +378,11 @@
             </if>
         </where>
     </select>
+
+    <select id="selectStaffLists" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
+        select su.sid         userSid,
+        si.name        userName
+        from sys_user su
+        left join sys_staffinfo si on su.staffSid = si.sid
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@@ -220,5 +220,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return sysStaffinfoService.getGressionUserList(userSid, orgPath);
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        return sysStaffinfoService.selectStaffLists();
+    }
+
 
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -749,25 +749,19 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         QueryWrapper<AppSysStaffVo> qw = new QueryWrapper<>();
         String orgSid = "";
         if (params != null) {
-            if(StringUtils.isBlank(params.getOrgPath())){
+            if(StringUtils.isNotBlank(params.getOrgPath())){
-                if (StringUtils.isNotBlank(params.getUserSid())) {
-                    ResultBean<String> stringResultBean = sysStaffOrgService.getPathSidByUserSid(params.getUserSid());
-                    if (stringResultBean.getSuccess()) {
-                        orgSid = stringResultBean.getData();
-                    }
-                }
-            }else{
                 String orgPath = params.getOrgPath();
                 orgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
             }
-
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.like("si.name", params.getName());
             }
-
+            if (params.getSelectSid() != null && params.getSelectSid().size() > 0){
-            if (params.getSelectSid().size() > 0){
                 qw.notIn("su.sid",params.getSelectSid());
             }
+            if(params.getState() == 0){
+                qw.eq("si.personTypeKey","01");
+            }
         }
         IPage<AppSysStaffVo> pagging = baseMapper.getUserList(page, qw, orgSid);
         List<AppSysStaffVo> list = pagging.getRecords();
@@ -798,4 +792,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         List<AppSysStaffVo> list = baseMapper.getGressionUserList(useOrgSid);
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
+        List<PcSysStaffVo> list = baseMapper.selectStaffLists();
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }