销售订单-完善

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -853,7 +853,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
-                //更新销售订单的状态为已通过的状态:审批通过1
+                //更新销售订单的状态为已通过的状态:审批通过2
                 //ToDo:
                 updateStateByBusinessSid(2, variables.get("businessSid").toString());
                 //通过后新增合同表中的信息。
@@ -1055,9 +1055,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (StringUtils.isNotBlank(query.getName())) {
                 qw.like("bo.customerName", query.getName());
             }
-            //订单类型
+            //销售订单类型“”或null 全部 “1” 待办理 “2”已办理
             if (StringUtils.isNotBlank(query.getType())) {
-                qw.eq("bo.type", query.getType());
+                //待办理
+                if("1".equals(query.getType())){
+                    qw.isNull("bo.nodeState");
+                }
+                //已办理
+                if("2".equals(query.getType())){
+                    qw.isNotNull("bo.nodeState");
+                }
             }
             if (StringUtils.isNotBlank(query.getStaffSid())) {
                 qw.eq("bo.staffSid", query.getStaffSid());
@@ -1079,6 +1086,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw);
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            if(StringUtils.isNotBlank(record.getCustomerPhoto())){
+                record.setCustomerPhoto(fileUploadComponent.getUrlPrefix()+record.getCustomerPhoto());
+            }
             //根据销售订单sid查询是否有合同，有合同的话，查询合同是否审核。且需补交订金是否为0
             String sid = record.getSid();
             ResultBean<CommonContractBuscenterVo> buscenterVoResultBean = commonContractFeign.selectByBusSid(sid);

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

@@ -294,7 +294,7 @@
     </update>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
-        select sso.staffSid,si.name from sys_staff_org sso
+        select sso.staffSid,si.name staffName from sys_staff_org sso
         left join sys_staffinfo si on sso.staffSid = si.sid
         where find_in_set(#{orgSid},replace(sso.orgSidPath,'/',','))
     </select>