Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
     public void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/v2/api-docs", "/su/**", "/student/apply", "/examRegistration/ocr", "/examOrder/paymentResult",
-                        "/examOrder/notify","/examinationBasic/getInfo","/examOrder/pageList")
+                        "/examOrder/notify","/examinationBasic/getInfo")
                 .permitAll()
                 .anyRequest().authenticated().and().csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler)
                 .authenticationEntryPoint(baseAuthenticationEntryPoint).and();

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

@@ -71,7 +71,8 @@ public class EmployeeController extends BaseController {
 	@ApiOperation("删除")
 	@PostMapping(value = "/del/{id}")
 	public HttpResponseResult add(@PathVariable("id") Integer id) {
-		return succeed(employeeService.delete(id));
+		employeeService.del(id);
+		return succeed();
 	}
 
 }

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

@@ -11,14 +11,11 @@ import com.keao.edu.thirdparty.adapay.Payment;
 import com.keao.edu.thirdparty.yqpay.Msg;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.Employee;
-import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
-import com.keao.edu.user.entity.ExamSong;
 import com.keao.edu.user.enums.TransStatusEnum;
-import com.keao.edu.user.page.ExamRegistrationQueryInfo;
+import com.keao.edu.user.page.ExamRegistrationPaymentQueryInfo;
 import com.keao.edu.user.service.EmployeeService;
 import com.keao.edu.user.service.ExamRegistrationPaymentService;
-import com.keao.edu.user.service.ExamRegistrationService;
 import com.keao.edu.util.date.DateUtil;
 import com.keao.edu.util.http.HttpUtil;
 import io.swagger.annotations.Api;
@@ -48,15 +45,15 @@ public class ExamOrderController extends BaseController {
 
     @ApiOperation(value = "缴费列表")
     @GetMapping(value = "pageList")
-    //@PreAuthorize("@pcs.hasPermissions('examOrder/pageList')")
-    public HttpResponseResult<PageInfo<ExamRegistrationPayment>> list(ExamRegistrationQueryInfo queryInfo) {
-//        SysUser sysUser = sysUserFeignService.queryUserInfo();
-//        if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
-//            Employee employee = employeeService.get(sysUser.getId());
-//            if (Objects.nonNull(employee)) {
-//                queryInfo.setOrganId(employee.getOrganId());
-//            }
-//        }
+    @PreAuthorize("@pcs.hasPermissions('examOrder/pageList')")
+    public HttpResponseResult<PageInfo<ExamRegistrationPayment>> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (!sysUser.getIsSuperAdmin() && Objects.isNull(queryInfo.getOrganId())) {
+            Employee employee = employeeService.get(sysUser.getId());
+            if (Objects.nonNull(employee)) {
+                queryInfo.setOrganId(employee.getOrganId());
+            }
+        }
         return succeed(examRegistrationPaymentService.pageList(queryInfo));
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistrationPayment.java

@@ -53,6 +53,8 @@ public class ExamRegistrationPayment {
 
 	private String tenantId;
 
+	private Integer organId;
+
 	private ExamRegistration examRegistration;
 	
 	public void setId(Long id){
@@ -182,11 +184,6 @@ public class ExamRegistrationPayment {
 	public void setMemo(String memo) {
 		this.memo = memo;
 	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
 
 	public ExamRegistration getExamRegistration() {
 		return examRegistration;
@@ -195,4 +192,18 @@ public class ExamRegistrationPayment {
 	public void setExamRegistration(ExamRegistration examRegistration) {
 		this.examRegistration = examRegistration;
 	}
+
+	public Integer getOrganId() {
+		return organId;
+	}
+
+	public void setOrganId(Integer organId) {
+		this.organId = organId;
+	}
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/ExamRegistrationPaymentQueryInfo.java

@@ -0,0 +1,54 @@
+package com.keao.edu.user.page;
+
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+
+public class ExamRegistrationPaymentQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "合作单位编号")
+    private Integer organId;
+
+    @ApiModelProperty(value = "考试报名编号")
+    private Integer examRegistrationId;
+
+    @ApiModelProperty(value = "考试项目编号")
+    private Integer examinationBasicId;
+
+    @ApiModelProperty(value = "学员编号")
+    private Integer studentId;
+
+
+    public Integer getExamRegistrationId() {
+        return examRegistrationId;
+    }
+
+    public void setExamRegistrationId(Integer examRegistrationId) {
+        this.examRegistrationId = examRegistrationId;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
+
+    public Integer getExaminationBasicId() {
+        return examinationBasicId;
+    }
+
+    public void setExaminationBasicId(Integer examinationBasicId) {
+        this.examinationBasicId = examinationBasicId;
+    }
+}

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/EmployeeService.java

@@ -17,4 +17,6 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      * @param employee
      */
     void updateEmployee(Employee employee);
+
+    void del(Integer id);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -5,6 +5,7 @@ import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.dto.StudentExamPaymentDto;
 import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
+import com.keao.edu.user.page.ExamRegistrationPaymentQueryInfo;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
 
 import java.util.List;
@@ -46,7 +47,12 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
     ExamRegistrationPayment updateOrder(Map<String,String> rpMap);
 
 
-    PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationQueryInfo queryInfo);
+    /**
+     * 获取缴费列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationPaymentQueryInfo queryInfo);
 
 
     /**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/EmployeeServiceImpl.java

@@ -12,6 +12,7 @@ import com.keao.edu.im.api.entity.ImUserModel;
 import com.keao.edu.user.dao.EmployeeDao;
 import com.keao.edu.user.dao.SysUserDao;
 import com.keao.edu.user.entity.Employee;
+import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.service.EmployeeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +50,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 			if(!user.getTenantId().equals(tenantId)){
 				throw new BizException("手机号已被占用");
 			}
+			if(user.getUserType().contains("SYSTEM")){
+				throw new BizException("手机号已被占用");
+			}
 			Employee employee1 = employeeDao.get(user.getId());
 			if(employee1 == null){
 				if(StringUtils.isEmpty(user.getPassword())){
@@ -106,4 +110,12 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 		sysUserDao.update(sysUser);
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getRealName(),sysUser.getAvatar()));
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void del(Integer id) {
+		Employee employee = employeeDao.get(id);
+		sysUserDao.delEmployeeRole(employee.getUserId());
+		employeeDao.delete(id);
+	}
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -16,9 +16,12 @@ import com.keao.edu.user.entity.ExamRegistration;
 import com.keao.edu.user.entity.ExamRegistrationPayment;
 import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import com.keao.edu.user.enums.TransStatusEnum;
+import com.keao.edu.user.page.ExamRegistrationPaymentQueryInfo;
 import com.keao.edu.user.page.ExamRegistrationQueryInfo;
 import com.keao.edu.user.service.ExamRegistrationPaymentService;
 import com.keao.edu.user.service.ExamRegistrationService;
+import com.keao.edu.user.service.OrganizationService;
+import com.keao.edu.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +38,8 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     private ExamRegistrationService examRegistrationService;
     @Autowired
     private YqPayFeignService yqPayFeignService;
+    @Autowired
+    private OrganizationService organizationService;
 
     @Override
     public BaseDAO<Long, ExamRegistrationPayment> getDAO() {
@@ -94,11 +99,24 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
     }
 
     @Override
-    public PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationQueryInfo queryInfo) {
-        PageInfo<ExamRegistrationPayment> examRegistrationPageInfo = new PageInfo<>();
-        List<ExamRegistrationPayment> orderPageList = examRegistrationPaymentDao.getOrderPageList();
-        examRegistrationPageInfo.setRows(orderPageList);
-        return examRegistrationPageInfo;
+    public PageInfo<ExamRegistrationPayment> pageList(ExamRegistrationPaymentQueryInfo queryInfo) {
+        PageInfo<ExamRegistrationPayment> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+        params.put("organIds", nextLevelOrganIds);
+
+        List<ExamRegistrationPayment> dataList = Collections.EMPTY_LIST;
+        int count = this.findCount(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = this.getDAO().queryPage(params);
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
     }
 
     @Override

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

@@ -117,6 +117,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 
         ExamRegistrationPayment examRegistrationPayment = new ExamRegistrationPayment();
         examRegistrationPayment.setTenantId(examinationBasic.getTenantId());
+        examRegistrationPayment.setOrganId(examRegistration.getOrganId());
         examRegistrationPayment.setExamRegistrationId(examRegistration.getId().longValue());
         examRegistrationPayment.setStudentId(examRegistration.getStudentId());
         examRegistrationPayment.setExaminationBasicId(examRegistration.getExaminationBasicId());

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -68,6 +68,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 			if(!user.getTenantId().equals(tenantId)){
 				throw new BizException("手机号已被占用");
 			}
+			if(user.getUserType().contains("SYSTEM")){
+				throw new BizException("手机号已被占用");
+			}
 			Organization organization = organDao.get(user.getId());
 			if(organization == null){
 				organ.setParentOrganIdTag(currentOrganization.getParentOrganIdTag() + "," + user.getId());
@@ -196,7 +199,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 	@Transactional(rollbackFor = Exception.class)
 	public void del(Integer id) {
 		Integer count = examOrganizationRelationDao.findByOrganId(id);
+		Organization organization = organDao.get(id);
 		if(count == null || count == 0){
+			sysUserDao.delEmployeeRole(organization.getUserId());
 			organDao.delete(id);
 		}else {
 			throw new BizException("删除失败：存在考试项目,无法删除");

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

@@ -31,6 +31,7 @@
 		<result column="memo_" property="memo" />
 		<association property="sysUser" columnPrefix="sys_user_" resultMap="com.keao.edu.user.dao.StudentDao.Student"/>
 		<association property="subject" columnPrefix="subject_" resultMap="com.keao.edu.user.dao.SubjectDao.Subject"/>
+		<association property="examinationBasic" columnPrefix="examination_basic_" resultMap="com.keao.edu.user.dao.ExaminationBasicDao.ExaminationBasic"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -313,8 +314,10 @@
 	</select>
 
 	<select id="getExamRegistrationInfo" resultMap="ExamRegistration">
-		SELECT er.*, su.id_ sys_user_id_, su.real_name_ sys_user_real_name_,su.phone_ sys_user_phone_ , s.id_ subject_id_, s.name_ subject_name_
+		SELECT er.*, su.id_ sys_user_id_, su.real_name_ sys_user_real_name_,su.phone_ sys_user_phone_ , s.id_ subject_id_,
+		s.name_ subject_name_ ,eb.name_ examination_basic_name_
 		FROM exam_registration er
+		LEFT JOIN examination_basic eb ON eb.id_=er.examination_basic_id_
 		LEFT JOIN sys_user su ON er.student_id_ = su.id_
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		WHERE er.id_ = #{id}

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

@@ -22,6 +22,7 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="tenant_id_" property="tenantId"/>
+        <result column="organ_id_" property="organId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -47,8 +48,8 @@
         </selectKey>
         -->
         INSERT INTO exam_registration_payment
-        (id_,exam_registration_id_,student_id_,examination_basic_id_,order_no_,trans_no_,mer_no_,trans_amount_,trans_status_,trans_successed_time_,create_time_,update_time_,tenant_id_)
-        VALUES(#{id},#{examRegistrationId},#{studentId},#{examinationBasicId},#{orderNo},#{transNo},#{merNo},#{transAmount},#{transStatus},#{transSuccessedTime},NOW(),NOW(),#{tenantId})
+        (id_,exam_registration_id_,student_id_,examination_basic_id_,order_no_,trans_no_,mer_no_,trans_amount_,trans_status_,trans_successed_time_,create_time_,update_time_,tenant_id_,organ_id_)
+        VALUES(#{id},#{examRegistrationId},#{studentId},#{examinationBasicId},#{orderNo},#{transNo},#{merNo},#{transAmount},#{transStatus},#{transSuccessedTime},NOW(),NOW(),#{tenantId},#{organId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -106,16 +107,43 @@
         WHERE id_ = #{id}
     </delete>
 
+
+    <sql id="queryCondition">
+        <where>
+            <if test="studentId!=null">
+                AND erp.student_id_=#{studentId}
+            </if>
+            <if test="examinationBasicId!=null">
+                AND erp.examination_basic_id_=#{examinationBasicId}
+            </if>
+            <if test="examRegistrationId!=null">
+                AND erp.exam_registration_id_=#{examRegistrationId}
+            </if>
+            <if test="organIds!=null">
+                AND erp.organ_id_ IN
+                <foreach collection="organIds" item="organId" separator="," open="(" close=")">
+                    #{organId}
+                </foreach>
+            </if>
+            <if test="search!=null">
+                AND (ec.card_no_ LIKE CONCAT('%', #{serch}, '%'))
+            </if>
+        </where>
+    </sql>
+
     <!-- 分页查询 -->
-    <select id="queryPage" resultMap="ExamRegistrationPayment" parameterType="map">
-        SELECT * FROM exam_registration_payment ORDER BY id_
+    <select id="queryPage" resultMap="pageList" parameterType="map">
+        SELECT erp.* FROM exam_registration_payment erp
+        LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        <include refid="queryCondition" />
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM exam_registration_payment
+        SELECT COUNT(*) FROM exam_registration_payment erp
+        LEFT JOIN exam_certification ec ON erp.exam_registration_id_ = ec.exam_registration_id_
+        <include refid="queryCondition" />
     </select>
 
     <!-- 获取项目用户未支付的订单 -->
@@ -157,10 +185,4 @@
     <resultMap id="pageList" type="com.keao.edu.user.entity.ExamRegistrationPayment" extends="ExamRegistrationPayment">
         <association property="examRegistration" select="com.keao.edu.user.dao.ExamRegistrationDao.getExamRegistrationInfo" column="{id=exam_registration_id_}"/>
     </resultMap>
-    <!-- 获取订单列表 -->
-    <select id="getOrderPageList" resultMap="pageList">
-        SELECT erp.*  FROM exam_registration_payment erp
-        LEFT JOIN sys_user su on erp.student_id_ = su.id_
-        LEFT JOIN subject s on erp.id_ = s.id_
-    </select>
 </mapper>