Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -177,4 +177,13 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
      */
     List<ExamRegistration> getNotInRoomStudents(@Param("examId") Long examId);
+
+    /**
+     * @describe 统计合作单位的招生人数
+     * @author Joburgess
+     * @date 2020.08.12
+     * @param organIds:
+     * @return com.keao.edu.user.dto.OrganExamRegistStatisticsDto
+     */
+    List<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(Map<String, Object> params);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamRegistrationPaymentDao.java

@@ -89,4 +89,25 @@ public interface ExamRegistrationPaymentDao extends BaseDAO<Long, ExamRegistrati
     BigDecimal countOrganPaymentAmountWithDay(@Param("examId") Long examId,
                                               @Param("organIds") List<Integer> organIds,
                                               @Param("day") String day);
+
+    /**
+     * 年收入
+     * @param tenantId
+     * @return
+     */
+    BigDecimal getAnnualIncome(@Param("tenantId") String tenantId);
+
+    /**
+     * 月收入
+     * @param tenantId
+     * @return
+     */
+    BigDecimal getMonthIncome(@Param("tenantId") String tenantId);
+
+    /**
+     * 日收入
+     * @param tenantId
+     * @return
+     */
+    List<Map<String, BigDecimal>> getDayIncome(@Param("tenantId") String tenantId, @Param("day") Integer day);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/OrganExamRegistStatisticsDto.java

@@ -0,0 +1,48 @@
+package com.keao.edu.user.dto;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.08.12
+ */
+public class OrganExamRegistStatisticsDto {
+
+    private Integer organId;
+
+    private String organName;
+
+    private Integer thisYearRegistStudentNum;
+
+    private Integer historyRegistStudentNum;
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public Integer getThisYearRegistStudentNum() {
+        return thisYearRegistStudentNum;
+    }
+
+    public void setThisYearRegistStudentNum(Integer thisYearRegistStudentNum) {
+        this.thisYearRegistStudentNum = thisYearRegistStudentNum;
+    }
+
+    public Integer getHistoryRegistStudentNum() {
+        return historyRegistStudentNum;
+    }
+
+    public void setHistoryRegistStudentNum(Integer historyRegistStudentNum) {
+        this.historyRegistStudentNum = historyRegistStudentNum;
+    }
+}

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExamRegistrationService.java

@@ -91,4 +91,13 @@ public interface ExamRegistrationService extends BaseService<Long, ExamRegistrat
     * @return
     */
    PageInfo<StudentBaseExamsDto> studentBaseExams(QueryInfo queryInfo);
+
+   /**
+    * @describe 统计合作单位的招生人数
+    * @author Joburgess
+    * @date 2020.08.12
+    * @param queryInfo:
+    * @return com.keao.edu.user.dto.OrganExamRegistStatisticsDto
+    */
+   PageInfo<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(QueryInfo queryInfo);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExaminationBasicService.java

@@ -92,4 +92,11 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      */
     Map<String, Object> getHomePageExams(Integer organId);
 
+
+    /**
+     * 获取首页收入支出
+     * @return
+     */
+    Object homeBalanceOfPayment(String tenantId,Integer day);
+
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -399,4 +399,27 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public PageInfo<OrganExamRegistStatisticsDto> getOrganExamRegistStatistics(QueryInfo queryInfo) {
+        PageInfo<OrganExamRegistStatisticsDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), false);
+        params.put("organIds", childOrganIds);
+
+        List<OrganExamRegistStatisticsDto> dataList = null;
+        int count = childOrganIds.size();
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = examRegistrationDao.getOrganExamRegistStatistics(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -447,7 +447,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		}
 
 		Set<Integer> locationIds = examRoomStudentWithOrgans.stream().filter(e -> Objects.nonNull(e.getExamLocationId())).map(ExamRoomStudentRelation::getExamLocationId).collect(Collectors.toSet());
-		Map<Integer, String> idLocationMap = this.getMap("exam_location", "id_", "name_", new ArrayList(locationIds), Integer.class, String.class);
+		Map<Integer, String> idLocationMap = this.getMap("exam_location", "id_", "address_", new ArrayList(locationIds), Integer.class, String.class);
 
 		Set<Integer> allStudentIds = examRoomStudentWithOrgans.stream().map(ExamRoomStudentRelation::getStudentId).collect(Collectors.toSet());
 		Map<Integer, String> idPhoneMap = this.getMap("sys_user", "id_", "phone_", new ArrayList(allStudentIds), Integer.class, String.class);

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -172,7 +172,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 				ec.setExamStartTime(examRoom.getExamStartTime());
 				ec.setExamEndTime(examRoom.getExamEndTime());
 				if(ExamModeEnum.OFFLINE.equals(examRoom.getExamMode())){
-					ec.setExamAddress(examLocation.getName());
+					ec.setExamAddress(examLocation.getAddress());
 				}
 				ec.setTenantId(TenantContextHolder.getTenantId());
 				examCertifications.add(ec);

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -1,5 +1,6 @@
 package com.keao.edu.user.service.impl;
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.enums.MessageTypeEnum;
@@ -64,6 +65,10 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     @Autowired
     private TenantInfoDao tenantInfoDao;
     @Autowired
+    private ExamRegistrationPaymentDao examRegistrationPaymentDao;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
     private ExamTeacherSalaryService examTeacherSalaryService;
 
     @Override
@@ -475,4 +480,14 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         result.put("statistics", tenantExamStatistics);
         return result;
     }
+
+
+    @Override
+    public Object homeBalanceOfPayment(String tenantId,Integer day) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        BigDecimal annualIncome = examRegistrationPaymentDao.getAnnualIncome(tenantId);
+        BigDecimal monthIncome = examRegistrationPaymentDao.getMonthIncome(tenantId);
+        List<Map<String,BigDecimal>> dayIncomes = examRegistrationPaymentDao.getDayIncome(tenantId,day);
+        return null;
+    }
 }

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamCertificationMapper.xml

@@ -136,7 +136,7 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="student_id_" property="studentId" />
 		<result column="level_" property="level" />
-		<result column="address_" property="examAddress" />
+		<result column="exam_address_" property="examAddress" />
 		<result column="name_" property="baseExamName" />
 	</resultMap>
 	<select id="queryExamCertificationDtoPage" resultMap="ExamCertificationDtoMap">

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -646,4 +646,24 @@
 			AND er.status_ IN ('AUDIT_PASS', 'AUDIT_WAIT')
 			AND NOT EXISTS ( SELECT id_ FROM exam_room_student_relation WHERE examination_basic_id_ = #{examId} AND er.id_ = exam_registration_id_ )
 	</select>
+
+    <select id="getOrganExamRegistStatistics" resultType="com.keao.edu.user.dto.OrganExamRegistStatisticsDto">
+		SELECT
+			o.id_ 'organId',
+			o.name_ 'organName',
+			SUM(CASE YEAR(er.create_time_) WHEN YEAR(NOW()) THEN 1 ELSE 0 END) 'thisYearRegistStudentNum',
+			SUM(CASE WHEN YEAR(er.create_time_)!=YEAR(NOW()) THEN 1 ELSE 0 END) 'historyRegistStudentNum'
+		FROM
+			organization o
+			LEFT JOIN exam_registration er ON er.organ_id_ = o.id_
+		WHERE er.status_ IN ('AUDIT_WAIT', 'AUDIT_PASS', 'AUDIT_REJECT')
+		AND o.id_ IN
+		<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+			#{organId}
+		</foreach>
+		GROUP BY
+			er.organ_id_
+		ORDER BY o.id_
+		<include refid="global.limit"/>
+	</select>
 </mapper>

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -244,6 +244,21 @@
                 #{organId}
             </foreach>
     </select>
+    <select id="getAnnualIncome" resultType="java.math.BigDecimal">
+        SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
+        WHERE erp.examination_basic_id_ = 1 AND erp.trans_status_ = 'SUCCESS'
+        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') = DATE_FORMAT('2020-08-12','%Y-%m-%d')
+    </select>
+    <select id="getMonthIncome" resultType="java.math.BigDecimal">
+        SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
+        WHERE erp.examination_basic_id_ = 1 AND erp.trans_status_ = 'SUCCESS'
+        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') = DATE_FORMAT('2020-08-12','%Y-%m-%d')
+    </select>
+    <select id="getDayIncome" resultType="java.util.Map">
+        SELECT SUM(erp.trans_amount_) FROM exam_registration_payment erp
+        WHERE erp.examination_basic_id_ = 1 AND erp.trans_status_ = 'SUCCESS'
+        AND DATE_FORMAT(erp.trans_successed_time_,'%Y-%m-%d') = DATE_FORMAT('2020-08-12','%Y-%m-%d')
+    </select>
 
     <resultMap id="ExamRegistrationPaymentDto" type="com.keao.edu.user.dto.ExamRegistrationPaymentDto"
                extends="ExamRegistrationPayment">

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRegistrationController.java

@@ -153,4 +153,19 @@ public class ExamRegistrationController extends BaseController {
         return succeed(examRegistrationService.repay(student.getId(), orderNo));
     }
 
+    @ApiOperation(value = "统计合作单位的招生人数")
+    @GetMapping(value = "getOrganExamRegistStatistics")
+    @PreAuthorize("@pcs.hasPermissions('examRegistration/getOrganExamRegistStatistics')")
+    public HttpResponseResult<PageInfo<OrganExamRegistStatisticsDto>> getOrganExamRegistStatistics(QueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.isNull(employee)){
+                return failed("用户信息异常");
+            }
+            queryInfo.setOrganId(employee.getOrganId());
+        }
+        return succeed(examRegistrationService.getOrganExamRegistStatistics(queryInfo));
+    }
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamSongController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -95,7 +96,7 @@ public class ExamSongController extends BaseController {
     @ApiOperation("根据专业获取曲目")
     @GetMapping(value = "/getWithSubject")
     @PreAuthorize("@pcs.hasPermissions('examSong/getWithSubject')")
-    public HttpResponseResult<List<ExamSong>> getWithSubject(Integer subjectId){
+    public HttpResponseResult<List<ExamSong>> getWithSubject(Integer subjectId) {
         return succeed(examSongService.getWithSubject(subjectId));
     }
 
@@ -112,21 +113,14 @@ public class ExamSongController extends BaseController {
     @GetMapping(value = "getImportTemplate")
     @PreAuthorize("@pcs.hasPermissions('examSong/getImportTemplate')")
     public void getImportTemplate(HttpServletResponse response) throws IOException {
-        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-        List<IniFileEntity> columns = IniFileUtil.readIniFile(inputStream).get("examSong");
-
+        InputStream inputStream = new ClassPathResource("excelTemplate/examSong.xls").getInputStream();
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = columns.stream().map(IniFileEntity::getKey).toArray(String[]::new);
-
-            List<Teacher> teachers = new ArrayList<>();
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, null, teachers);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=examSong-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
-            workbook.write(outputStream);
+            IOUtils.copy(inputStream, outputStream);
             outputStream.flush();
         } catch (Exception e) {
             e.printStackTrace();
@@ -142,5 +136,4 @@ public class ExamSongController extends BaseController {
     }
 
 
-
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -5,6 +5,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.tenant.TenantContextHolder;
 import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.ExaminationBasic;
@@ -129,4 +130,13 @@ public class ExaminationBasicController extends BaseController {
         }
         return succeed(examinationBasicService.getHomePageExams(organId));
     }
+
+
+    @ApiOperation("获取首页收入支出")
+    @PostMapping(value = "/homeBalanceOfPayment")
+    @PreAuthorize("@pcs.hasPermissions('examinationBasic/homeBalanceOfPayment')")
+    public HttpResponseResult homeBalanceOfPayment(Integer day){
+        String tenantId = TenantContextHolder.getTenantId();
+        return succeed(examinationBasicService.homeBalanceOfPayment(tenantId,day));
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/OrganizationController.java

@@ -18,6 +18,7 @@ import com.keao.edu.util.iniFile.IniFileUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -121,21 +122,14 @@ public class OrganizationController extends BaseController {
     @GetMapping(value = "getImportTemplate")
     @PreAuthorize("@pcs.hasPermissions('organization/getImportTemplate')")
     public void getImportTemplate(HttpServletResponse response) throws IOException {
-        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-        List<IniFileEntity> organizationColumns = IniFileUtil.readIniFile(inputStream).get("organization");
-
+        InputStream inputStream = new ClassPathResource("excelTemplate/organization.xls").getInputStream();
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = organizationColumns.stream().map(IniFileEntity::getKey).toArray(String[]::new);
-
-            List<Organization> organizations = new ArrayList<>();
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, null, organizations);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=organization-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
-            workbook.write(outputStream);
+            IOUtils.copy(inputStream, outputStream);
             outputStream.flush();
         } catch (Exception e) {
             e.printStackTrace();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TeacherController.java

@@ -11,24 +11,17 @@ import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.TeacherQueryInfo;
 import com.keao.edu.user.service.TeacherService;
 import com.keao.edu.util.date.DateUtil;
-import com.keao.edu.util.excel.POIUtil;
-import com.keao.edu.util.iniFile.IniFileEntity;
-import com.keao.edu.util.iniFile.IniFileUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.*;
 
 /**
@@ -100,21 +93,14 @@ public class TeacherController extends BaseController {
     @GetMapping(value = "getImportTemplate")
     @PreAuthorize("@pcs.hasPermissions('teacher/getImportTemplate')")
     public void getImportTemplate(HttpServletResponse response) throws IOException {
-        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-        List<IniFileEntity> columns = IniFileUtil.readIniFile(inputStream).get("teacher");
-
+        InputStream inputStream = new ClassPathResource("excelTemplate/teacher.xls").getInputStream();
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = columns.stream().map(IniFileEntity::getKey).toArray(String[]::new);
-
-            List<Teacher> teachers = new ArrayList<>();
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, null, teachers);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacher-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
-            workbook.write(outputStream);
+            IOUtils.copy(inputStream, outputStream);
             outputStream.flush();
         } catch (Exception e) {
             e.printStackTrace();

edu-user/edu-user-server/src/main/resources/columnMapper.ini

@@ -6,7 +6,7 @@
 曲目类别(练习曲or演奏曲) = type
 
 [organization]
-合作单位名字 = name
+合作机构名字 = name
 联系人名字 = contactName
 联系人电话 = contactPhone
 角色 = roleName
@@ -17,7 +17,7 @@
 老师姓名 = realName
 手机号 = phone
 职称 = title
-专业(,分隔) = subjectIdList
+专业(英文逗号分隔) = subjectIdList
 结算方式 = salarySettlementType
 薪酬 = salary
 证书编号 = certificateNo

pom.xml

@@ -283,6 +283,8 @@
 						<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttc</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xls</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
 				</configuration>
 			</plugin>