Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@@ -78,4 +78,9 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String billNo; // 单据编号
     @ApiModelProperty("财务中客户编码")
     private String cwCustomerNo;
+
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName;
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@@ -101,4 +101,9 @@ public class BaseVehicleOutDto implements Dto {
     private String isUpdateOrInsertCrm; // 是否要修改客户
     @ApiModelProperty("财务中客户编码")
     private String cwCustomerNo;
+
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName;
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -64,31 +64,34 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
-        select vinSid,
-               vinNo,
-               type,
-               typeKey,
-               orgSid,
-               orgName,
-               staffName,
-               staffSid,
-               concatNo,
-               price,
-               case isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
-               customerName,
-               customerSid,
-               mobile,
-               giftsDescription,
-               salesAllowance,
-               middleOne,
-               middleTwo,
-               rebateMoneyOne,
-               rebateMoneyTwo,
-               remarks,
-               saleDate,
-               createOrgSid
-        from base_vehicle_out
-        where sid = #{sid}
+        select bo.vinSid,
+                bo.vinNo,
+                bo.type,
+                bo.typeKey,
+                bo.orgSid,
+                bo.orgName,
+                bo.staffName,
+                bo.staffSid,
+                bo.concatNo,
+                bo.price,
+                case bo.isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
+                bo.customerName,
+                bo.customerSid,
+                bo.mobile,
+                bo.giftsDescription,
+                bo.salesAllowance,
+                bo.middleOne,
+                bo.middleTwo,
+                bo.rebateMoneyOne,
+                bo.rebateMoneyTwo,
+                bo.remarks,
+                bo.saleDate,
+                bo.createOrgSid,
+                ba.innerName,
+                ba.innerUserSid
+        from base_vehicle_out bo
+        left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+        where bo.sid = #{sid}
     </select>
 
     <select id="selectCountBySidVin" resultType="int">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -306,6 +306,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOutApply.setSaleTypeValue(dto.getType());
         baseVehicleOutApply.setCreateOrgSid(dto.getCreateOrgSid());
         baseVehicleOutApply.setCreateBySid(dto.getCreateBySid());
+        //内部引荐人、内部引荐人sid
+        baseVehicleOutApply.setInnerName(dto.getInnerName());
+        baseVehicleOutApply.setInnerUserSid(dto.getInnerUserSid());
         //保存车辆出库单主表
         baseVehicleOutApplyService.save(baseVehicleOutApply);
         //出库单子表关联主表sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1692,11 +1692,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
-        //车型
         String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue();
         String modelName = "车型：" + baseVehicleModel.getVehicleAlias()+"。";
-        //配置
-        String modelConfig = "配置：" + modelName1+"/"+appOrderModelInfoVo.getConfig() + "。";
+        //配置：后桥/速比/轴距/悬架/鞍座/颜色/驾驶室/保险杠/燃料箱/导流罩/独立热源/缓速器/护轮罩/后视镜/轮胎/轮毂材质/空调/坐骑/多媒体/配置包
+        String modelConfig = "配置：" + baseVehicleModel.getModelName()+"/"+appOrderModelInfoVo.getConfig() + "。";
         //上装
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1655,7 +1655,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
                 //登记日期
                 freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
-                freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                if(vvvv.getVIN().length() >= 8){
+                    freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                }
                 //收款用途
                 freceivebillentry.setFPURPOSEIDKey("001");
                 freceivebillentry.setFPURPOSEIDType("cw_skyt");
@@ -1713,7 +1715,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
                 //登记日期
                 freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
-                freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                if(vvvv.getVIN().length() >= 8){
+                    freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                }
                 //收款用途
                 freceivebillentry.setFPURPOSEIDKey("002");
                 freceivebillentry.setFPURPOSEIDType("cw_skyt");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java

@@ -9,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -82,7 +83,11 @@ public interface SysFunctionFeign {
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysFunctionVo> fetchBySid(@PathVariable("sid") String sid);
+    @ApiOperation("角色授权时查询功能列表")
+    @GetMapping("/getFunctionAuthorization/{roleSid}")
+    public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(@PathVariable("roleSid") String roleSid);
     @ApiOperation("查询按钮的权限")
     @PostMapping("/getButtonPermissions")
     public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -90,6 +91,11 @@ public class SysFunctionFeignFallback implements SysFunctionFeign {
 		return rb.setMsg("接口anrui_portal/sysfunction/fetchBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(String roleSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
 		return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -57,4 +58,12 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
     int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
 
      List<ButtonPermissionVo>  getButtonPermissions(@Param("query")ButtonPermissionQuery query);
+     @Select("SELECT ss.sourceName,ss.sid FROM sys_source ss  LEFT JOIN sys_source_role ssr ON ss.sid=ssr.sorceSid where ssr.rolesid=#{roleSid}")
+    List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
+    @Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm  LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
+    List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
+    @Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,0,1) state  FROM sys_function sf  " +
+            " LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid  " +
+            " WHERE sf.actionUrl= #{pageUrl} ")
+    List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -193,9 +194,18 @@ public class SysFunctionRest implements SysFunctionFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(String roleSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String,Object>> list=sysFunctionService.getFunctionAuthorization(roleSid);
+        return rb.success().setData(list);
+    }
+
     @Override
     public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
         ResultBean<List<ButtonPermissionVo>> rb = ResultBean.fireFail();
         return rb.success().setData(sysFunctionService.getButtonPermissions(query));
     }
+    //getFunctionAuthorization(){
+    // }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@@ -17,7 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -240,4 +242,38 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
 		List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
 		return buttonPermissions ;
     }
+
+    public List<Map<String, Object>> getFunctionAuthorization(String roleSid) {
+		List<Map<String,Object>> list=new ArrayList<>();
+		List<Map<String, Object>> lsources=baseMapper.getSourceAuthorization(roleSid);
+		lsources.forEach(f->{
+			Map<String,Object> map=new HashMap<>();
+			map.put("name",f.get("sourceName").toString());
+			map.put("sid",f.get("sid").toString());
+			map.put("state","1");
+			list.add(map);
+		});
+
+		list.forEach(f->{
+			List<Map<String,Object>> list2=new ArrayList<>();
+			String sid = f.get("sid").toString();
+			List<Map<String, Object>> lmenus=baseMapper.getMenuAuthorization(sid);
+			lmenus.forEach(ff->{
+				Map<String,Object> map=new HashMap<>();
+				map.put("name",ff.get("name"));
+				String sids = ff.get("sid").toString();
+				map.put("sid",sids);
+				map.put("state","1");
+
+				if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){
+					String pageUrl =ff.get("pageUrl").toString();
+					List<Map<String, Object>> lfuncs=baseMapper.getFunctionAuthorization(pageUrl);
+					map.put("children",lfuncs);
+				}
+				list2.add(map);
+			});
+			f.put("children",list2);
+		});
+		return list;
+    }
 }