修改租车订单

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java

@@ -89,4 +89,10 @@ public class AppUserVo {
 	private  Integer state;
     @ApiModelProperty(value = "支付宝授权返回的code")
 	private String aliCode;
+
+	@ApiModelProperty(value = "用户职位名称")
+	private String jobTitle;
+	@ApiModelProperty(value = "用户会员名称")
+	private String memberName;
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -21,4 +21,6 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     void updateUserPositionByUserId(@Param("userId") Integer id, @Param("positionId") Integer positionId);
 
     List<Integer> getUserIdByUsername(@Param("keywords") String keywords);
+
+    AppUserVo getUserVo();
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -33,15 +33,52 @@
         <result column="code" property="code"/>
         <result column="inviter_account" property="inviterAccount"/>
         <result column="state" property="state"/>
+        <result column="jobTitle" property="jobTitle"/>
+        <result column="memberName" property="memberName"/>
     </resultMap>
 
 
     <!--  获取用户信息 -->
     <select id="getUserInfo" resultMap="AppUserVoMap">
-    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name  as jobTitle,buml.name as memberName  from app_user_login l
     left join  app_user_detail d
     on d.userid = l.id
-     where d.userid = #{userId}  limit 1
+    left join base_user_member bum
+    on bum.user_id=l.id
+    left join  base_user_member_level buml
+    on bum.member_level = buml.level
+    left join   app_user_position  p
+    on d.position_id=p.id
+    where
+    p.is_del=0
+    and
+    buml.isdel=0
+    and
+    bum.is_del=0
+    and
+     d.userid = #{userId}  limit 1
+  </select>
+
+
+    <!--  获取用户信息 -->
+    <select id="getUserVo" resultMap="AppUserVoMap">
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name  as jobTitle,buml.name as memberName  from app_user_login l
+    left join  app_user_detail d
+    on d.userid = l.id
+    left join base_user_member bum
+    on bum.user_id=l.id
+    left join  base_user_member_level buml
+    on bum.member_level = buml.level
+    left join   app_user_position  p
+    on d.position_id=p.id
+    where
+    p.is_del=0
+    and
+    buml.isdel=0
+    and
+    bum.is_del=0
+    and
+     d.userid = #{userId}  limit 1
   </select>
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -126,12 +126,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
             dto.setCompanyIds(companyIds);
         }
 
-        if (dto.getStartZoneId()!=null){
-            if (userDTO.getDataAll()!=1&&!dto.getStartZoneId().equals(userDTO.getZoneId())) {
+        if (dto.getZoneId()!=null){
+            if (userDTO.getDataAll()!=1&&!dto.getZoneId().equals(userDTO.getZoneId())) {
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }else {
                 ArrayList<Integer> zoneIds = new ArrayList<>();
-                zoneIds.add(dto.getStartZoneId());
+                zoneIds.add(dto.getZoneId());
                 dto.setZoneIds(zoneIds);
             }
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/ImportVehicleDataBiz.java

+package com.xxfc.platform.vehicle.biz;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.vehicle.entity.Constant;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.mapper.VehicleMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+@Slf4j
+public class ImportVehicleDataBiz extends BaseBiz<VehicleMapper, Vehicle> {
+    @Autowired
+    private ConstantBiz constantBiz;
+
+    @Transactional(rollbackFor = Exception.class)
+    public Object parsingUploadedFiles(List<List<Object>> excel) {
+        try {
+
+            StringBuffer stringBuffer = new StringBuffer();
+            StringBuffer stringBuffer2 = new StringBuffer();
+            for (int i = 0; i < excel.size(); i++) {
+
+                System.out.println(i);
+                List<Object> list = excel.get(i);
+                //获取车牌号
+                String numberPlate = (String) list.get(2);
+                if (StringUtils.isBlank(numberPlate)) {
+                    continue;
+                }
+                Example example = new Example(Vehicle.class);
+                example.createCriteria().andEqualTo("numberPlate", numberPlate);
+                List<Vehicle> vehicles = mapper.selectByExample(example);
+                if (CollectionUtils.isEmpty(vehicles)) {
+                    stringBuffer.append(numberPlate).append(",");
+                    continue;
+                }
+
+                Example example1 = new Example(Constant.class);
+                example1.createCriteria().andEqualTo("type", 3);
+                List<Constant> constants = constantBiz.selectByExample(example1);
+
+                for (Vehicle vehicle : vehicles) {
+                    if (i==83){
+                        System.out.println("测试");
+                    }
+                    log.info("修改前:" + vehicle.toString());
+                    if (numberPlate.equals(vehicle.getNumberPlate()) && !( String.valueOf(list.get(1)).equals(vehicle.getCode()))) {
+                        stringBuffer2.append("numberPlate:" + numberPlate).append(",").append("code:" + ((String) list.get(2))).append("|");
+                    }
+
+                    //设置托管人
+                    if (list.get(5) != null) {
+                        vehicle.setBelongTo(2);
+                        vehicle.setBelongToName((String) list.get(5));
+                    }
+
+
+                    //设置车架号
+                    if (list.get(6) != null) {
+                        vehicle.setVin((String) list.get(6));
+                    }
+
+
+//                    //设置交强险公司
+//                    if (list.get(7) != null && !((String) list.get(7)).trim().equals("未知")) {
+//                        String company = (String) list.get(7);
+//                        for (Constant constant : constants) {
+//                            if (constant.getVal().contains(company)) {
+//                                vehicle.setStrongInsuranceCompany(constant.getCode());
+//                                break;
+//                            }
+//                        }
+//
+//
+//                    }
+//
+//                    //设置交强险单号
+//                    if (list.get(8) != null) {
+//                        vehicle.setStrongInsuranceNo((String) list.get(8));
+//                    }
+//
+//                    //设置交强险到期时间
+//                    if ((list.get(9) != null) && String.valueOf(list.get(9)).trim() != "") {
+//                        vehicle.setStrongInsuranceEndDate(((DateTime) list.get(9)).toJdkDate());
+//                    }
+
+                    //设置商业险公司
+                    if (list.get(10) != null) {
+                        String company = (String) list.get(10);
+
+                        for (Constant constant : constants) {
+                            if (constant.getVal().contains(company)) {
+                                vehicle.setInsuranceCompany(constant.getCode());
+                                break;
+                            }
+                        }
+                    }
+
+                    //设置商业险单号
+                    if (list.get(11) != null) {
+                        vehicle.setInsuranceNo((String) list.get(11));
+                    }
+                    //设置商业险到期时间
+                    if (list.get(12) != null&&String.valueOf(list.get(12)).trim()!="") {
+                        vehicle.setInsuranceEndDate(((DateTime) list.get(12)).toJdkDate());
+                    }
+
+
+                    //设置年审时间
+                    if (list.get(13) != null&&String.valueOf(list.get(13)).trim()!="") {
+                        DateTime dateTime = (DateTime) list.get(13);
+                        vehicle.setAnnualVerificationDate(dateTime.toJdkDate());
+                    }
+
+                    //设置发动机号
+                    if (list.get(14) != null) {
+                        vehicle.setEngineNum(String.valueOf(list.get(14)) );
+                    }
+
+                    System.out.println(i);
+                    log.info("修改后:" + vehicle.toString());
+                    mapper.updateByPrimaryKeySelective(vehicle);
+                }
+
+            }
+            System.out.println("stringBuffer:"+stringBuffer);
+            System.out.println("stringBuffer2:"+stringBuffer2);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return null;
+    }
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/ImportVehicleDataController.java

+package com.xxfc.platform.vehicle.rest.admin;
+
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.vehicle.biz.ImportVehicleDataBiz;
+import com.xxfc.platform.vehicle.common.BaseController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/vehicle/import")
+@Slf4j
+public class ImportVehicleDataController extends BaseController<ImportVehicleDataBiz> {
+    @PostMapping("/excel/import")
+    public ObjectRestResponse excelImport(@RequestParam("file")MultipartFile excelFile) throws IOException {
+
+        String filename = excelFile.getOriginalFilename();
+        String split = filename.substring(filename.lastIndexOf("."));
+        if (".xlsx".equals(split)) {
+            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"文件格式错误,必须为.xlsx文件!!");
+        }
+        List<List<Object>> excel= ExcelUtil.getReader(excelFile.getInputStream()).read();
+        if (excel==null||excel.size()<3) {
+            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"导入文件无数据!!");
+        }
+
+        excel.remove(0);
+        excel.remove(1);
+        log.error(String.valueOf(excel.size()));
+        return ObjectRestResponse.succ(baseBiz.parsingUploadedFiles(excel));
+    }
+
+
+}