diff --git a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java index f5cc096..049fd5b 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distribution/impl/DistributionServiceImpl.java @@ -1,7 +1,9 @@ package cn.com.tenlion.service.examination.distribution.impl; +import cn.com.tenlion.dao.applystudentsnew.IApplyStudentsNewDao; import cn.com.tenlion.dao.examination.distribution.IDistributionDao; import cn.com.tenlion.institutionmanagement.pojo.dtos.institution.InstitutionDTO; +import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; import cn.com.tenlion.pojo.bos.distribution.DistributionBO; @@ -21,27 +23,25 @@ import cn.com.tenlion.pojo.vos.distributionfield.DistributionFieldVO; import cn.com.tenlion.pojo.vos.examapply.ExamApplyVO; import cn.com.tenlion.service.apply.IApplyService; import cn.com.tenlion.service.applystudents.IApplyStudentsService; -import cn.com.tenlion.dao.applystudentsnew.IApplyStudentsNewDao; import cn.com.tenlion.service.classplan.IClassPlanService; import cn.com.tenlion.service.examapply.IExamApplyService; import cn.com.tenlion.service.examination.distribution.IDistributionService; import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; import cn.com.tenlion.service.examination.distributionfield.IDistributionFieldService; import cn.com.tenlion.service.examination.stationuser.IStationUserService; -import cn.com.tenlion.institutionmanagement.service.institution.IInstitutionService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.module.dictionary.pojo.dtos.DataDTO; import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.util.map.HashMapUtil; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -311,8 +311,10 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist distributionCardVO.setClassPlanId(classPlanId); distributionCardVO.setDistributionId(classPlanId); distributionCardVO.setDistributionCardPictures(""); - DataDTO dataDTO = dataDictionaryServiceImpl.get(userList.get(i).getApplySex()); - distributionCardVO.setDistributionCardUserSex(dataDTO.getDataName()); + // 保存性别中文，又用中文差名称，暂时改为直接输出 + // DataDTO dataDTO = dataDictionaryServiceImpl.get(userList.get(i).getApplySex()); + // distributionCardVO.setDistributionCardUserSex(dataDTO.getDataName()); + distributionCardVO.setDistributionCardUserSex(userList.get(i).getApplySex()); distributionCardVO.setDistributionCardUserIdentity(userList.get(i).getApplyCardNumber()); distributionCardVO.setDistributionCardUserResult(""); distributionCardVO.setDistributionCardUserStatus("0"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..00a1fae --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,100 @@ +server: + port: 7009 + url: http://127.0.0.1:7009/signup + system-title: 考试报名系统 + system-sub-title: 考试报名系统 + default-home-page: indexweb + servlet: + context-path: /signup + +spring: + login-url: /oauth/login + login-failure: /oauth/login?error + login-process: /userlogin + assets-matchers: /assets/** + thymeleaf: + prefix: classpath:/templates/ + suffix: .html + mode: HTML5 + encoding: UTF-8 + cache: false + main: + allow-bean-definition-overriding: true + servlet: + multipart: + max-file-size: 1GB + max-request-size: 1GB + datasource: + druid: + url: jdbc:mysql://127.0.0.1:3306/db_examination_signup?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC + db-type: mysql + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: root + initial-size: 2 + min-idle: 2 + max-active: 5 + max-wait: 60000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 10 + filter: + commons-log: + connection-logger-name: stat,wall,log4j + stat: + log-slow-sql: true + slow-sql-millis: 2000 + connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + use-global-data-source-stat: true + +# 数据库 +mybatis: + config-location: classpath:mybatis/mybatis-config.xml + mapper-locations: classpath*:mybatis/mapper/**/*.xml + +# 文档 +swagger: + base-package-list: ink.wgink,cn.com.tenlion + +# 文件 +file: + # 文件的保存路径 + upload-path: C:\Users\wenc0\Desktop\UploadFiles + # 图片类型 + image-types: png,jpg,jpeg,gif,blob + # 视频类型 + video-types: mp4,rmvb + # 音频类型 + audio-types: mp3,wmv,amr + # 文件类型 + file-types: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf + # 同时上传最大支持数 + max-file-count: 6 + # 图片输出压缩质量，大于0，默认0.4 + image-output-quality: 0.4 + # 媒体最大时长（单位：秒） + media-max-duration: + # 后台 + backend: + video: 10 + audio: 60 + # 微信 + wechat: + video: 10 + audio: 60 + # app + app: + video: 10 + audio: 60 + +# 日志 +logging: + level: + root: error + ink.wgink: debug + cn.com.tenlion: debug \ No newline at end of file