Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/controller/WelcomeBedController.java

@@ -627,7 +627,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         for (WelcomeBed bed:beds) {
             ListVo data = new ListVo();
             data.setId(bed.getId());
-            data.setName(bed.getName());
+            data.setName(String.valueOf( bed.getNumber()));
             datas.add(data);
         }
         return CommonResult.ok(datas);

src/main/java/com/template/controller/WelcomeCityController.java

@@ -46,16 +46,31 @@ public class WelcomeCityController implements WelcomeCityControllerAPI {
 
     @Override
     public CommonResult getCityLevel(int provinceId) {
+        //直辖市
+        List<String> cityStrs = new ArrayList<>();
+        cityStrs.add("北京市");
+        cityStrs.add("天津市");
+        cityStrs.add("上海市");
+        cityStrs.add("重庆市");
         List<WelcomeCity> citys = welcomeCityService.queryAllCitys(provinceId);
         List<ListVo> lists = new ArrayList<>();
         if(citys != null && citys.size() > 0){
             for (WelcomeCity city:citys) {
                 ListVo data = new ListVo();
+                if(cityStrs.contains(city.getCityZh())){
+                    data.setId(city.getParentId());
+                    data.setName(city.getCityZh());
+                    lists.add(data);
+                    break;
+                }
+
                 data.setId(city.getId());
                 data.setName(city.getCityZh());
                 lists.add(data);
             }
         }
+
+
         return CommonResult.ok(lists);
     }
 

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -133,17 +133,24 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         ws.setPoliticalStatu(isr.getPoliticalStatu());
         ws.setNationality(isr.getNationality());
         ws.setPhone(isr.getPhone());
+        ws.setOprovince(isr.getOprovince());
+        ws.setOcity(isr.getOcity());
+        ws.setOdistrict(isr.getOdistrict());
         ws.setOprovinceId(isr.getOprovinceId());
         ws.setOcityId(isr.getOcityId());
         ws.setOdistrictId(isr.getOdistrictId());
         ws.setProvinceId(isr.getProvinceId());
         ws.setCityId(isr.getCityId());
         ws.setDistrictId(isr.getDistrictId());
+        ws.setProvince(isr.getProvince());
+        ws.setCity(isr.getCity());
+        ws.setDistrict(isr.getDistrict());
         ws.setAddress(isr.getAddress());
         ws.setTrafficMethod(isr.getTrafficMethod());
         ws.setArrive(isr.getArrive());
         ws.setArrvieDate(isr.getArrvieDate());
         ws.setArriveTime(isr.getArriveTime());
+        ws.setArriveTimeId(isr.getArriveTimeId());
         ws.setZipCode(isr.getZipCode());
         ws.setRegisterOntime(isr.getRegisterOntime());
         //ws.setAmountPayable(isr.getAmountPayable());
@@ -154,8 +161,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         //region 家庭成员数据
         List<WelcomeFamily> wfs = new ArrayList<>();
-        if (isr.getFamilys() != null && isr.getFamilys().size() > 0) {
-            for (InsertFamilyRequest family : isr.getFamilys()) {
+        if (isr.getFvs() != null && isr.getFvs().size() > 0) {
+            for (InsertFamilyRequest family : isr.getFvs()) {
                 if(!(StringUtils.hasText(family.getFamilyShip()) && StringUtils.hasText(family.getName())
                 && StringUtils.hasText(family.getWorkUnit()) && StringUtils.hasText(family.getPhone()))){
                     return CommonResult.fail("家庭成员信息不能为空！");
@@ -173,8 +180,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
         //region 陪同人员数据
         List<WelcomeAccompany> was = new ArrayList<>();
-        if (isr.getAccompanys() != null && isr.getAccompanys().size() > 0) {
-            for (InsertAccompanyRequest accompany : isr.getAccompanys()) {
+        if (isr.getAvs() != null && isr.getAvs().size() > 0) {
+            for (InsertAccompanyRequest accompany : isr.getAvs()) {
                 if(!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))){
                     return CommonResult.fail("陪同人员信息不能为空！");
                 }
@@ -275,17 +282,24 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         student.setPoliticalStatu(usr.getPoliticalStatu());
         student.setNationality(usr.getNationality());
         student.setPhone(usr.getPhone());
+        student.setOprovince(usr.getOprovince());
+        student.setOcity(usr.getOcity());
+        student.setOdistrict(usr.getOdistrict());
         student.setOprovinceId(usr.getOprovinceId());
         student.setOcityId(usr.getOcityId());
         student.setOdistrictId(usr.getOdistrictId());
         student.setProvinceId(usr.getProvinceId());
         student.setCityId(usr.getCityId());
         student.setDistrictId(usr.getDistrictId());
+        student.setProvince(usr.getProvince());
+        student.setCity(usr.getCity());
+        student.setDistrict(usr.getDistrict());
         student.setAddress(usr.getAddress());
         student.setTrafficMethod(usr.getTrafficMethod());
         student.setArrive(usr.getArrive());
         student.setArrvieDate(usr.getArrvieDate());
         student.setArriveTime(usr.getArriveTime());
+        student.setArriveTimeId(usr.getArriveTimeId());
         student.setZipCode(usr.getZipCode());
         student.setRegisterOntime(usr.getRegisterOntime());
         //ws.setAmountPayable(isr.getAmountPayable());
@@ -1358,6 +1372,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 //        寝室总数
         int dormitoryTotal = welcomeDormitoryService.count(new QueryWrapper<>());
 
+        int payCount=welcomeStudentService.payCount();
 //        已入住寝室数
         LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
         wrapper.ne(WelcomeDormitory::getStatus,2);
@@ -1367,12 +1382,16 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         LocalDateTime end = start.plusDays(1);
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         Integer visitorTotal=welcomeVisitorService.countTotal(start,end);
+        Integer carTotal = welcomeVisitorService.carTotal();
 
         StudentOverviewVo vo = new StudentOverviewVo();
+        vo.setEnrollmentTotal(6532);
         vo.setStudentTotal(studentTotal);
+        vo.setPayCount(payCount);
         vo.setDormitoryTotal(dormitoryTotal);
         vo.setCheckInTotal(count);
         vo.setVisitorTotal(visitorTotal);
+        vo.setCarTotal(carTotal);
 
         return CommonResult.ok(vo);
     }

src/main/java/com/template/mapper/WelcomeStudentMapper.java

@@ -24,7 +24,7 @@ import java.util.List;
 public interface WelcomeStudentMapper extends BaseMapper<WelcomeStudent> {
     IPage<StudentPageVo> queryStudentPageList(IPage<StudentPageVo> page, @Param("collegeId") Integer collegeId,@Param("majorId") Integer majorId,@Param("classstrId") Integer classstrId,@Param("trafficMethod") String trafficMethod ,@Param("name") String name);
 
-    List<StudentPageVo> queryStudentList(@Param("collegeId") Integer collegeId, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
+    List<StudentPageVo> queryStudentPageList(@Param("collegeId") Integer collegeId, @Param("majorId") Integer majorId, @Param("classstrId") Integer classstrId, @Param("trafficMethod") String trafficMethod , @Param("name") String name);
 
     List<StudentRegisterVo> studentRegister();
 

src/main/java/com/template/model/request/InsertStudentRequest.java

@@ -109,6 +109,18 @@ public class InsertStudentRequest implements Serializable {
     private String phone;
 
     @ApiModelProperty(value = "籍贯省")
+    @NotNull(message = "籍贯省不能为空")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市")
+    @NotNull(message = "籍贯市不能为空")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区")
+    @NotNull(message = "籍贯区不能为空")
+    private String odistrict;
+
+    @ApiModelProperty(value = "籍贯省")
     @NotNull(message = "籍贯省ID不能为空")
     private Integer oprovinceId;
 
@@ -132,6 +144,18 @@ public class InsertStudentRequest implements Serializable {
     @NotNull(message = "区ID不能为空")
     private Integer districtId;
 
+    @ApiModelProperty(value = "省ID")
+    @NotBlank(message = "省不能为空")
+    private String province;
+
+    @ApiModelProperty(value = "市ID")
+    @NotBlank(message = "市不能为空")
+    private String city;
+
+    @ApiModelProperty(value = "区ID")
+    @NotBlank(message = "区不能为空")
+    private String district;
+
     @ApiModelProperty(value = "家庭住址")
     @NotBlank(message = "家庭住址不能为空")
     private String address;
@@ -152,6 +176,10 @@ public class InsertStudentRequest implements Serializable {
     @NotBlank(message = "到站时间不能为空")
     private String arriveTime;
 
+    @ApiModelProperty(value = "到站时间")
+    @NotNull(message = "到站时间不能为空")
+    private Integer arriveTimeId;
+
     @ApiModelProperty(value = "邮编")
     @NotBlank(message = "邮编不能为空")
     private String zipCode;
@@ -173,10 +201,10 @@ public class InsertStudentRequest implements Serializable {
 //    private String carNumber;
 
     //家庭成员
-    private List<InsertFamilyRequest> familys;
+    private List<InsertFamilyRequest> fvs;
 
     //陪同人员
-    private List<InsertAccompanyRequest> accompanys;
+    private List<InsertAccompanyRequest> avs;
 
     //楼栋
     private String build;

src/main/java/com/template/model/request/updateStudentRequest.java

@@ -109,6 +109,18 @@ public class updateStudentRequest implements Serializable {
 
     @ApiModelProperty(value = "籍贯省")
     @NotNull(message = "籍贯省ID不能为空")
+    private String oprovince;
+
+    @ApiModelProperty(value = "籍贯市")
+    @NotNull(message = "籍贯市ID不能为空")
+    private String ocity;
+
+    @ApiModelProperty(value = "籍贯区")
+    @NotNull(message = "籍贯区ID不能为空")
+    private String odistrict;
+
+    @ApiModelProperty(value = "籍贯省")
+    @NotNull(message = "籍贯省ID不能为空")
     private Integer oprovinceId;
 
     @ApiModelProperty(value = "籍贯市")
@@ -131,6 +143,18 @@ public class updateStudentRequest implements Serializable {
     @NotNull(message = "区ID不能为空")
     private Integer districtId;
 
+    @ApiModelProperty(value = "省ID")
+    @NotBlank(message = "省不能为空")
+    private String province;
+
+    @ApiModelProperty(value = "市ID")
+    @NotBlank(message = "市不能为空")
+    private String city;
+
+    @ApiModelProperty(value = "区ID")
+    @NotBlank(message = "区不能为空")
+    private String district;
+
     @ApiModelProperty(value = "家庭住址")
     @NotBlank(message = "家庭住址不能为空")
     private String address;
@@ -151,6 +175,10 @@ public class updateStudentRequest implements Serializable {
     @NotBlank(message = "到站时间不能为空")
     private String arriveTime;
 
+    @ApiModelProperty(value = "到站时间")
+    @NotNull(message = "到站时间不能为空")
+    private Integer arriveTimeId;
+
     @ApiModelProperty(value = "邮编")
     @NotBlank(message = "邮编不能为空")
     private String zipCode;

src/main/java/com/template/model/vo/StudentDetailVo.java

@@ -139,9 +139,6 @@ public class StudentDetailVo {
     @JsonIgnore
     private Integer arriveTimeId;
 
-    @ApiModelProperty(value = "到站时间段集合")
-    private List<ArriveTimeVo> ats;
-
     @ApiModelProperty(value = "家庭成员集合")
     private List<FamilyVo> fvs;
 

src/main/java/com/template/model/vo/StudentOverviewVo.java

@@ -4,17 +4,26 @@ import lombok.Data;
 
 @Data
 public class StudentOverviewVo {
-//    学生报到数
+    //录取人数
+    private Integer EnrollmentTotal;
+
+    //预学生报到数
     private Integer studentTotal;
 
-//    寝室总数
+    //寝室总数
     private Integer dormitoryTotal;
 
-//    入住总数
+    //已交付
+    private Integer payCount;
+
+    //入住总数
     private Integer checkInTotal;
 
-//    当天访客总数
+    //当天车牌数
     private Integer visitorTotal;
 
+    //当天车牌数
+    private Integer carTotal;
+
 
 }

src/main/java/com/template/services/WelcomeStudentService.java

@@ -56,4 +56,6 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     Integer totalCount();
 
+    int payCount();
+
 }

src/main/java/com/template/services/WelcomeVisitorService.java

@@ -68,4 +68,6 @@ public interface WelcomeVisitorService extends IService<WelcomeVisitor> {
 
     Integer countTotal(LocalDateTime start, LocalDateTime end);
 
+    Integer carTotal();
+
 }

src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -91,7 +91,7 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     @Override
     public List<StudentPageVo> queryStudentList( Integer collegeId, Integer majorId, Integer classstrId, String trafficMethod, String name) {
 
-        List<StudentPageVo> result = welcomeStudentMapper.queryStudentList(collegeId, majorId, classstrId, trafficMethod, name);
+        List<StudentPageVo> result = welcomeStudentMapper.queryStudentPageList(collegeId, majorId, classstrId, trafficMethod, name);
         return result;
     }
 
@@ -147,6 +147,14 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
+    public int payCount() {
+        QueryWrapper<WelcomeStudent> wss = new QueryWrapper<>();
+        wss.gt("pay_amount",0);
+        Integer count = welcomeStudentMapper.selectCount(wss);
+        return count;
+    }
+
+    @Override
     public WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(e -> e.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum)

src/main/java/com/template/services/impl/WelcomeVisitorServiceImpl.java

@@ -195,6 +195,12 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         return count;
     }
 
+    @Override
+    public Integer carTotal() {
+        int result = this.count(null);
+        return result;
+    }
+
     /**
      * 新增车辆信息
      * @param visitor  访客信息

src/main/resources/mapper/template/WelcomeStudentMapper.xml

@@ -21,9 +21,9 @@
         select (select count(id) from welcome_accompany where student_card = ws.card_id) as accompanyNum,
         ws.id,ws.admiss_num,ws.name,ws.card_id,ws.college,ws.major,ws.classstr,
         ws.traffic_method,ws.arrive,ws.amount_payable,ws.pay_amount,
-        CONCAT(wsd.building, '-', wsd.dormitory, '-', wsd.bed_num) as dormitory
+        CONCAT(wsd.build, '-', wsd.dormitory, '-', wsd.number) as dormitory
         from welcome_student ws
-        left join welcome_student_dormitory wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
+        left join welcome_bed wsd on wsd.deleted =0 and wsd.student_card = ws.card_id
         where ws.deleted = 0
         <if test="collegeId != null and collegeId != ''">
             and ws.college_id = #{collegeId}