问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorVo.java

@@ -62,11 +62,11 @@ public class BaseDistributorVo implements Vo {
     @ApiModelProperty("创建组织（陕汽必须字段）")
     private String createOrg;
 
-//    @ApiModelProperty(value = "使用组织sid：string类型")
+    @ApiModelProperty(value = "使用组织sid：string类型")
-//    private String useOrgSid;
+    private String useOrgSid;
 
-    @ApiModelProperty(value = "使用组织sid:List类型")
+    /*@ApiModelProperty(value = "使用组织sid:List类型")
-    private String[][] useOrg;
+    private String[][] useOrg;*/
 
     @ApiModelProperty(value = "使用组织名称")
     private String useOrgName;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificate.java

@@ -141,6 +141,9 @@ public class BaseVehicleCertificate extends BaseEntity {
     @ApiModelProperty("合格证照片（陕汽必须字段）")
     private String certificatePhoto;
 
+    @ApiModelProperty("公告型号")
+    private String noticeModel;
+
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDetailsVo.java

@@ -134,6 +134,9 @@ public class BaseVehicleCertificateDetailsVo implements Vo {
     @ApiModelProperty("底盘型号（陕汽必须字段）")
     private String chassisModel;
 
+    @ApiModelProperty("公告型号")
+    private String noticeModel;
+
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateDto.java

@@ -144,6 +144,9 @@ public class BaseVehicleCertificateDto implements Dto {
     @ApiModelProperty("底盘型号（陕汽必须字段）")
     private String chassisModel;
 
+    @ApiModelProperty("公告型号")
+    private String noticeModel;
+
     @ApiModelProperty("备注（陕汽必须字段）")
     private String remarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -104,8 +104,8 @@ public interface BaseVehicleModelFeign {
      * @return
      */
     @ApiOperation("修改回显")
-    @GetMapping("/getAll/{sid}")
+    @GetMapping("/getAll/{sid}/{userSid}")
-    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid);
+    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
 
 
     /**

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -59,7 +59,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
 
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -94,7 +94,7 @@
         bd.address,
         bd.zipCode,
         bd.createOrg,
-        <!--bd.useOrg useOrgSid,-->
+        bd.useOrg useOrgSid,
         bd.useOrgName
         from base_distributor bd
         where sid = #{sid};

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -206,21 +206,6 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
     public BaseDistributorVo selBySid(String sid) {
         BaseDistributor baseDistributor = fetchBySid(sid);
         BaseDistributorVo baseDistributorVo = baseMapper.selBySid(sid);
-        if (StringUtils.isNotBlank(baseDistributor.getUseOrg())) {//使用组织sid
-            //将string类型转换为List类型
-            List<String> list = Arrays.asList(baseDistributor.getUseOrg().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            baseDistributorVo.setUseOrg(s);
-        }
         return baseDistributorVo;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -134,6 +134,8 @@
         bvc.power,
         <!--底盘型号-->
         bvc.chassisModel,
+        <!--公告型号-->
+        bvc.noticeModel,
         <!--  备注-->
         bvc.remarks
         from base_vehicle_certificate bvc

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -163,12 +163,22 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
         if (vo == null) {
             return rb.setMsg("该车型信息不存在");
         }
+        int i3 = baseVehmodelConfigService.checkByModelSid(sid);
+        if (i3 > 0){
+            return rb.setMsg("该车型已有关联配置，无法修改");
+        }
+        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
+        String sid1 = useOrgByUserSid.getData().getSid();
+        int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
+        if (i4 == 0){
+            return rb.setMsg("该车型不属于当前分公司，无法修改");
+        }
         return rb.success().setData(vo);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -544,17 +544,6 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
-        int i3 = baseVehmodelConfigService.checkByModelSid(sid);
-        if (i3 > 0){
-            return rb.setMsg("该车型已有关联配置，无法修改");
-        }
-        String userSid = dto.getUserSid();
-        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
-        String sid1 = useOrgByUserSid.getData().getSid();
-        int i4 = this.checkByCreateOrgAndModelSid(sid1, sid);
-        if (i4 == 0){
-            return rb.setMsg("该车型不属于当前分公司，无法修改");
-        }
         dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue());
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         String modelName = dto.getModelName();

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -105,6 +105,11 @@ public interface SysOrganizationFeign {
     @GetMapping("/selectBySid")
     ResultBean<SysOrganization> selectBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("根据组织架构sid查询组织下所有分公司")
+    @ResponseBody
+    @GetMapping("/selectUseOrgSidBySid")
+    ResultBean<List<Map<String,String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid);
+
     /**
      * 查询公司所有的部门
      *

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -7,6 +7,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/>
@@ -112,6 +113,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<SysOrgListVo>> selectListOne() {
         return null;

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -83,6 +84,26 @@ public interface SysStaffinfoFeign {
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid);
 
+    /**
+     * 获取集团内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取集团内全部员工姓名")
+    @GetMapping("/getStaffName")
+    public ResultBean<List<Map<String,String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName);
+
+    /**
+     * 获取部门内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取集团内全部员工姓名")
+    @GetMapping("/getStaffNameByDeptSid")
+    public ResultBean<List<Map<String,String>>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid);
+
 
     @ApiOperation("获取App通讯录")
     @ResponseBody
@@ -104,4 +125,5 @@ public interface SysStaffinfoFeign {
     @GetMapping("/selectStaffList")
     ResultBean<List<PcSysStaffVo>> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery);
 
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.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/>
@@ -50,6 +51,16 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffName(String staffName) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        return null;
+    }
+
     @Override
     public ResultBean selectAppContactsList(String names) {
         return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfoselectAppContactsList无法访问");

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -11,6 +11,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/>
@@ -99,4 +100,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 
     @Select("select * from sys_organization WHERE staffSid=#{sid}")
     SysOrganizationVo getUseOrgByStaffSid(String sid);
+
+    List<Map<String, String>> selectUseOrgSidBySid(String psid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -153,4 +153,15 @@
         WHERE so.sid = #{sid}
         ORDER BY so.sort ASC
     </select>
+
+    <select id="selectUseOrgSidBySid" resultType="java.util.Map">
+        SELECT
+                sid,
+                name
+        FROM
+                sys_organization
+        WHERE psid = #{psid}
+          AND isDelete = 0
+          AND isDept = 0
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -216,6 +216,13 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return new ResultBean<SysOrganization>().success().setData(sysOrganization);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> maps = sysOrganizationService.selectUseOrgSidBySid(sid);
+        return rb.success().setData(maps);
+    }
+
     /**
      * 查询公司所有的部门
      *

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -377,4 +377,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return baseMapper.getQrCodeVo(sid);
     }
 
+    public List<Map<String,String>> selectUseOrgSidBySid(String sid) {
+        SysOrganization sysOrganization = fetchBySid(sid);
+        String psid = sysOrganization.getPsid();
+        return baseMapper.selectUseOrgSidBySid(psid);
+    }
 }

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

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -110,4 +111,8 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      * @return
      */
     List<PcSysStaffVo> selectStaffList(String orgSid);
+
+    List<Map<String, String>> getStaffName(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
+
+    List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
 }

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

@@ -8,7 +8,8 @@
             resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsVo">
         SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
         FROM sys_staffinfo staff
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
+                     LEFT JOIN sys_user user
+        ON staff.sid = user.staffSid
         ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
     </select>
 
@@ -47,7 +48,8 @@
                staff.position,
                GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
         FROM sys_staffinfo staff
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
+                     LEFT JOIN sys_user user
+        ON staff.sid = user.staffSid
                 LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
         WHERE staff.sid = #{staffSid}
         GROUP BY staff.sid
@@ -65,15 +67,15 @@
                IFNULL(NULL, 0)   AS staffNum
         FROM sys_staff_org org
                      INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
-                     LEFT JOIN sys_user user ON staff.sid = user.staffSid
+                     LEFT JOIN sys_user user
+        ON staff.sid = user.staffSid
         WHERE org.orgSid = #{sid}
     </select>
     <!--根据员工类型key查询员工工号的最大号-->
     <select id="selectJobNumber" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
         select *
         from sys_staffinfo
-        order by jobNumber desc
+        order by jobNumber desc limit 1
-        limit 1
     </select>
     <!--根据手机号查询员工是否重复-->
     <select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@@ -294,8 +296,18 @@
     </update>
     <!--查询当前分公司下的员工信息-->
     <select id="selectStaffList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
-        select sso.staffSid,si.name staffName 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,'/',','))
+        where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
+    </select>
+
+    <select id="getStaffName" resultType="java.util.Map">
+        SELECT sid, name
+        FROM sys_staffinfo ${ew.customSqlSegment}
+    </select>
+
+    <select id="getStaffNameByDeptSid" resultType="java.util.Map">
+
     </select>
 </mapper>

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -131,6 +132,20 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return rb.success().setData(sysStaffinfo);
     }
 
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffName(String staffName) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> staffNameList = sysStaffinfoService.getStaffName(staffName);
+        return rb.success().setData(staffNameList);
+    }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String, String>> staffNameList = sysStaffinfoService.getStaffNameByDeptSid(staffName,deptSid);
+        return rb.success().setData(staffNameList);
+    }
+
 
     @Override
     public ResultBean<List<SysStaffinfoAppContactsVo>> selectAppContactsList(String names) {

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

@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -192,6 +193,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (sysStaffinfo2 != null) {
             return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工");
         }
+        //判断身份证号出生日期和填写的出生日期是否相同
+        String idNo = dto.getIdNo();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyddMM");
+        String birthday = simpleDateFormat.format(dto.getBirthday());
+        String substring = idNo.substring(6, 15);
+        if (!birthday.equals(substring)){
+            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
+        }
         //查询部门和岗位是否为空
         if (dto.getSysStaffOrg() == null) {
             return rb.setMsg("员工部门信息不能为空");
@@ -514,4 +523,23 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return rb.success().setData(list);
     }
+
+    public List<Map<String, String>> getStaffName(String staffName) {
+        QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(staffName)) {
+            qw.like("name", staffName);
+        }
+        qw.eq("isDelete",0);
+        return baseMapper.getStaffName(qw);
+    }
+
+    public List<Map<String, String>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(staffName)) {
+            qw.like("name", staffName);
+        }
+        //qw.eq("")
+        qw.eq("isDelete",0);
+        return baseMapper.getStaffNameByDeptSid(qw);
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java

@@ -60,8 +60,8 @@ public class ScmWarehouseQuery implements Query {
 	@ApiModelProperty("名称")
     private String warehouseName; // 名称
     
-	@ApiModelProperty("仓库属性")
+	@ApiModelProperty("详细地址")
-    private String warehouseAttribute; // 仓库属性
+    private String warehouseAttribute; // 详细地址
     
 	@ApiModelProperty("仓库负责人")
     private String warehouseContract; // 仓库负责人

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -71,11 +71,11 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseName())) {
-			qw.eq("warehouseName", query.getWarehouseName());
+			qw.like("warehouseName", query.getWarehouseName());
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseAttribute())) {
-			qw.eq("warehouseAttribute", query.getWarehouseAttribute());
+			qw.like("warehouseAttribute", query.getWarehouseAttribute());
 		}
 
 		if (StringUtils.isNotBlank(query.getWarehouseContract())) {