diff --git a/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java b/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java new file mode 100644 index 0000000..3d05d76 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/api/examination/distributioncard/DistributionCardController.java @@ -0,0 +1,110 @@ +package cn.com.tenlion.controller.api.examination.distributioncard; + +import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: DistributionCardController + * @Description: 考场分配准考证 + * @Author: CodeFactory + * @Date: 2021-05-03 16:46:42 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "考场分配准考证接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/distributioncard") +public class DistributionCardController extends DefaultBaseController { + + @Autowired + private IDistributionCardService distributionCardService; + + @ApiOperation(value = "新增考场分配准考证", notes = "新增考场分配准考证接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody DistributionCardVO distributionCardVO) { + distributionCardService.save(distributionCardVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除考场分配准考证", notes = "删除考场分配准考证接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@PathVariable("ids") String ids) { + distributionCardService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改考场分配准考证", notes = "修改考场分配准考证接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "distributionCardId", value = "考场分配准考证ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{distributionCardId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("distributionCardId") String distributionCardId, @RequestBody DistributionCardVO distributionCardVO) { + distributionCardService.update(distributionCardId, distributionCardVO); + return new SuccessResult(); + } + + @ApiOperation(value = "考场分配准考证详情", notes = "考场分配准考证详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "distributionCardId", value = "考场分配准考证ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{distributionCardId}") + public DistributionCardDTO get(@PathVariable("distributionCardId") String distributionCardId) { + return distributionCardService.get(distributionCardId); + } + + @ApiOperation(value = "考场分配准考证列表", notes = "考场分配准考证列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return distributionCardService.list(params); + } + + @ApiOperation(value = "考场分配准考证分页列表", notes = "考场分配准考证分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return distributionCardService.listPage(page); + } + + @ApiOperation(value = "考场分配准考证统计", notes = "考场分配准考证统计接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("count") + SuccessResultData count() { + Map params = requestParams(); + return new SuccessResultData<>(distributionCardService.count(params)); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java b/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java index a94f73f..fadeb27 100644 --- a/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java +++ b/src/main/java/cn/com/tenlion/controller/api/examination/field/FieldController.java @@ -1,8 +1,14 @@ package cn.com.tenlion.controller.api.examination.field; +import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; +import cn.com.tenlion.organizationmanagement.service.organization.IOrganizationService; +import cn.com.tenlion.pojo.dtos.examination.ExaminationDTO; +import cn.com.tenlion.pojo.dtos.field.FieldDTO; import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; import cn.com.tenlion.pojo.vos.worktype.WorkTypeVO; +import cn.com.tenlion.service.examination.IExaminationService; +import cn.com.tenlion.service.examination.field.IFieldService; import cn.com.tenlion.service.worktype.IWorkTypeService; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -29,7 +35,26 @@ import java.util.Map; **/ @Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "考场信息接口") @RestController -@RequestMapping(ISystemConstant.API_PREFIX + "/worktype") +@RequestMapping(ISystemConstant.API_PREFIX + "/field") public class FieldController extends DefaultBaseController { + @Autowired + private IFieldService iFieldService; + + @ApiOperation(value = "分页列表", notes = "分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-page") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return iFieldService.listPage(page); + } + } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java new file mode 100644 index 0000000..aa8c2e6 --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/app/api/examination/distribution/DistributionAppController.java @@ -0,0 +1,43 @@ +package cn.com.tenlion.controller.app.api.examination.distribution; + +import cn.com.tenlion.pojo.dtos.distribution.DistributionDTO; +import cn.com.tenlion.service.examination.distribution.IDistributionService; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: DistributionAppController + * @Description: 考场分配 + * @Author: CodeFactory + * @Date: 2021-05-03 16:46:42 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "考场分配接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/distribution") +public class DistributionAppController extends DefaultBaseController { + + @Autowired + private IDistributionService distributionService; + + @ApiOperation(value = "考场分配详情(通过考试申请ID)", notes = "考场分配详情(通过考试申请ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "planId", value = "通过考试申请ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{planId}") + public DistributionDTO get(@RequestHeader("token") String token, @PathVariable("planId") String planId) { + return distributionService.get(planId); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java b/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java new file mode 100644 index 0000000..c32cc5b --- /dev/null +++ b/src/main/java/cn/com/tenlion/controller/app/api/examination/distributioncard/DistributionCardAppController.java @@ -0,0 +1,47 @@ +package cn.com.tenlion.controller.app.api.examination.distributioncard; + +import cn.com.tenlion.service.examination.distributioncard.IDistributionCardService; +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import cn.com.tenlion.pojo.dtos.distributioncard.DistributionCardDTO; +import cn.com.tenlion.pojo.vos.distributioncard.DistributionCardVO; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: DistributionCardAppController + * @Description: 考场分配准考证 + * @Author: CodeFactory + * @Date: 2021-05-03 16:46:42 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "考场分配准考证接口") +@RestController +@RequestMapping(ISystemConstant.APP_PREFIX + "/distributioncard") +public class DistributionCardAppController extends DefaultBaseController { + + @Autowired + private IDistributionCardService distributionCardService; + + @ApiOperation(value = "考场分配准考证详情(报名ID)", notes = "考场分配准考证详情(报名ID)接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "distributionCardId", value = "报名ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{distributionCardId}") + public DistributionCardDTO get(@RequestHeader("token") String token, @PathVariable("distributionCardId") String distributionCardId) { + return distributionCardService.get(distributionCardId); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java index 7cf6491..91e3a58 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/distribution/DistributionDTO.java @@ -50,6 +50,26 @@ public class DistributionDTO { private String distributionAllotTime; @ApiModelProperty(name = "distributionFieldList", value = "") private ListdistributionFieldList; + @ApiModelProperty(name = "distributionEndTime", value = "预计结束时间") + private String distributionEndTime; + @ApiModelProperty(name = "distributionAllotEndTime", value = "分配结束时间") + private String distributionAllotEndTime; + + public String getDistributionEndTime() { + return distributionEndTime == null ? "" : distributionEndTime; + } + + public void setDistributionEndTime(String distributionEndTime) { + this.distributionEndTime = distributionEndTime; + } + + public String getDistributionAllotEndTime() { + return distributionAllotEndTime == null ? "" : distributionAllotEndTime; + } + + public void setDistributionAllotEndTime(String distributionAllotEndTime) { + this.distributionAllotEndTime = distributionAllotEndTime; + } public List getDistributionFieldList() { return distributionFieldList; diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java index b69dcc4..98614d0 100644 --- a/src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java +++ b/src/main/java/cn/com/tenlion/pojo/dtos/distributioncard/DistributionCardDTO.java @@ -30,6 +30,8 @@ public class DistributionCardDTO { private String distributionCardUserId; @ApiModelProperty(name = "distributionCardUserName", value = "对应的考生姓名") private String distributionCardUserName; + @ApiModelProperty(name = "fieldName", value = "考场名称") + private String fieldName; @ApiModelProperty(name = "creator", value = "") private String creator; @ApiModelProperty(name = "gmtCreate", value = "") @@ -40,6 +42,54 @@ public class DistributionCardDTO { private String gmtModified; @ApiModelProperty(name = "isDelete", value = "") private Integer isDelete; + @ApiModelProperty(name = "distributionCardUserSex", value = "对应的考生性别") + private String distributionCardUserSex; + @ApiModelProperty(name = "distributionCardUserIdentity", value = "对应的考生证件") + private String distributionCardUserIdentity; + @ApiModelProperty(name = "distributionCardUserResult", value = "对应的考生成绩") + private String distributionCardUserResult; + @ApiModelProperty(name = "distributionCardUserStatus", value = "对应的考生参加考试状态,2:未参加,1:已参加.0:未开始") + private String distributionCardUserStatus; + + public String getDistributionCardUserSex() { + return distributionCardUserSex == null ? "" : distributionCardUserSex; + } + + public void setDistributionCardUserSex(String distributionCardUserSex) { + this.distributionCardUserSex = distributionCardUserSex; + } + + public String getDistributionCardUserIdentity() { + return distributionCardUserIdentity == null ? "" : distributionCardUserIdentity; + } + + public void setDistributionCardUserIdentity(String distributionCardUserIdentity) { + this.distributionCardUserIdentity = distributionCardUserIdentity; + } + + public String getDistributionCardUserResult() { + return distributionCardUserResult == null ? "" : distributionCardUserResult; + } + + public void setDistributionCardUserResult(String distributionCardUserResult) { + this.distributionCardUserResult = distributionCardUserResult; + } + + public String getDistributionCardUserStatus() { + return distributionCardUserStatus == null ? "" : distributionCardUserStatus; + } + + public void setDistributionCardUserStatus(String distributionCardUserStatus) { + this.distributionCardUserStatus = distributionCardUserStatus; + } + + public String getFieldName() { + return fieldName == null ? "" : fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } public String getDistributionCardId() { return distributionCardId == null ? "" : distributionCardId.trim(); diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/field/FieldDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/field/FieldDTO.java new file mode 100644 index 0000000..b726d9d --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/dtos/field/FieldDTO.java @@ -0,0 +1,28 @@ +package cn.com.tenlion.pojo.dtos.field; + +import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: ExaminationDTO + * @Description: + * @Author: CodeFactory + * @Date: 2021-05-01 15:16:57 + * @Version: 3.0 + **/ +@ApiModel +public class FieldDTO extends OrganizationDTO { + + @ApiModelProperty(name = "fieldName", value = "考点名称") + private String fieldName; + + public String getFieldName() { + return fieldName == null ? "" : fieldName; + } + + public void setFieldName(String fieldName) { + this.fieldName = fieldName; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java b/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java index 22ee382..b9132bd 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionSaveVO.java @@ -33,6 +33,16 @@ public class DistributionSaveVO { private String stationId; @ApiModelProperty(name = "distributionRemark", value = "备注信息") private String distributionRemark; + @ApiModelProperty(name = "distributionEndTime", value = "预计结束时间") + private String distributionEndTime; + + public String getDistributionEndTime() { + return distributionEndTime == null ? "" : distributionEndTime; + } + + public void setDistributionEndTime(String distributionEndTime) { + this.distributionEndTime = distributionEndTime; + } public String getPlanId() { return planId == null ? "" : planId; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java b/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java index c8d4984..a4616d1 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/distribution/DistributionVO.java @@ -1,6 +1,7 @@ package cn.com.tenlion.pojo.vos.distribution; import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNullAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,6 +22,7 @@ public class DistributionVO { @ApiModelProperty(name = "distributionTime", value = "最终分配时间") private String distributionTime; @ApiModelProperty(name = "distributionFields", value = "最终分配考场,多个") + @CheckNullAnnotation(name = "分配考场") private String distributionFields; @ApiModelProperty(name = "distributionStatus", value = "1:分配成功,0:分配退回") private String distributionStatus; @@ -33,8 +35,30 @@ public class DistributionVO { private String planName; @ApiModelProperty(name = "stationId", value = "") private String stationId; - @ApiModelProperty(name = "distributionAllotTime", value = "") + @ApiModelProperty(name = "distributionAllotTime", value = "分配开始时间") + @CheckNullAnnotation(name = "分配开始时间") private String distributionAllotTime; + @ApiModelProperty(name = "distributionEndTime", value = "预计结束时间") + private String distributionEndTime; + @ApiModelProperty(name = "distributionAllotEndTime", value = "分配结束时间") + @CheckNullAnnotation(name = "分配结束时间") + private String distributionAllotEndTime; + + public String getDistributionEndTime() { + return distributionEndTime == null ? "" : distributionEndTime; + } + + public void setDistributionEndTime(String distributionEndTime) { + this.distributionEndTime = distributionEndTime; + } + + public String getDistributionAllotEndTime() { + return distributionAllotEndTime == null ? "" : distributionAllotEndTime; + } + + public void setDistributionAllotEndTime(String distributionAllotEndTime) { + this.distributionAllotEndTime = distributionAllotEndTime; + } public String getPlanName() { return planName == null ? "" : planName; diff --git a/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java b/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java index 7abdf69..3944655 100644 --- a/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java +++ b/src/main/java/cn/com/tenlion/pojo/vos/distributioncard/DistributionCardVO.java @@ -30,6 +30,46 @@ public class DistributionCardVO { private String distributionCardUserId; @ApiModelProperty(name = "distributionCardUserName", value = "对应的考生姓名") private String distributionCardUserName; + @ApiModelProperty(name = "distributionCardUserSex", value = "对应的考生性别") + private String distributionCardUserSex; + @ApiModelProperty(name = "distributionCardUserIdentity", value = "对应的考生证件") + private String distributionCardUserIdentity; + @ApiModelProperty(name = "distributionCardUserResult", value = "对应的考生成绩") + private String distributionCardUserResult; + @ApiModelProperty(name = "distributionCardUserStatus", value = "对应的考生参加考试状态,2:未参加,1:已参加.0:未开始") + private String distributionCardUserStatus; + + public String getDistributionCardUserSex() { + return distributionCardUserSex == null ? "" : distributionCardUserSex; + } + + public void setDistributionCardUserSex(String distributionCardUserSex) { + this.distributionCardUserSex = distributionCardUserSex; + } + + public String getDistributionCardUserIdentity() { + return distributionCardUserIdentity == null ? "" : distributionCardUserIdentity; + } + + public void setDistributionCardUserIdentity(String distributionCardUserIdentity) { + this.distributionCardUserIdentity = distributionCardUserIdentity; + } + + public String getDistributionCardUserResult() { + return distributionCardUserResult == null ? "" : distributionCardUserResult; + } + + public void setDistributionCardUserResult(String distributionCardUserResult) { + this.distributionCardUserResult = distributionCardUserResult; + } + + public String getDistributionCardUserStatus() { + return distributionCardUserStatus == null ? "" : distributionCardUserStatus; + } + + public void setDistributionCardUserStatus(String distributionCardUserStatus) { + this.distributionCardUserStatus = distributionCardUserStatus; + } public String getDistributionId() { return distributionId == null ? "" : distributionId.trim(); 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 3a3207c..db7b249 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 @@ -227,7 +227,15 @@ public class DistributionServiceImpl extends DefaultBaseService implements IDist public DistributionDTO get(String distributionId) { Map params = super.getHashMap(2); params.put("distributionId", distributionId); - return get(params); + DistributionDTO dto = get(params); + /** + * 回显考场 + */ + Map query = new HashMap(); + query.put("distributionId",dto.getDistributionId()); + List dtoList= iDistributionFieldService.list(query); + dto.setDistributionFieldList(dtoList); + return dto; } @Override diff --git a/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java b/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java index 7d015c0..b70a140 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributioncard/IDistributionCardService.java @@ -47,6 +47,14 @@ public interface IDistributionCardService { */ void save(DistributionCardVO distributionCardVO); + /** + * 新增考场分配准考证 + * + * @param distributionCardVO + * @return + */ + void saveById(String distributionCardId, DistributionCardVO distributionCardVO); + /** * 新增考场分配准考证 * diff --git a/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java index 91eda92..0dd41cf 100644 --- a/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/examination/distributioncard/impl/DistributionCardServiceImpl.java @@ -27,6 +27,7 @@ import ink.wgink.util.map.HashMapUtil; import ink.wgink.util.UUIDUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -119,14 +120,18 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I * 保存准考证生成信息 */ DistributionCardVO distributionCardVO = new DistributionCardVO(); - distributionCardVO.setDistributionCardUserId(userList.get(i).getApplyId()); + distributionCardVO.setDistributionCardUserId(userList.get(i).getCreate()); distributionCardVO.setDistributionCardUserName(userList.get(i).getApplyName()); distributionCardVO.setDistributionCardNumber(j + ""); distributionCardVO.setDistributionFieldId(fieldDTO.getDistributionFieldId()); distributionCardVO.setClassPlanId(classPlanId); distributionCardVO.setDistributionId(distributionDTO.getDistributionId()); distributionCardVO.setDistributionCardPictures(base64); - save(distributionCardVO); + distributionCardVO.setDistributionCardUserSex(userList.get(i).getApplySex()); + distributionCardVO.setDistributionCardUserIdentity(userList.get(i).getApplyCardNumber()); + distributionCardVO.setDistributionCardUserResult(""); + distributionCardVO.setDistributionCardUserStatus("0"); + save(userList.get(i).getApplyId(), distributionCardVO); } } } @@ -151,6 +156,14 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I saveReturnId(distributionCardVO); } + @Override + public void saveById(String distributionCardId, DistributionCardVO distributionCardVO) { + Map params = HashMapUtil.beanToMap(distributionCardVO); + params.put("distributionCardId", distributionCardId); + setSaveInfo(params); + distributionCardDao.save(params); + } + @Override public void save(String token, DistributionCardVO distributionCardVO) { saveReturnId(token, distributionCardVO); @@ -254,7 +267,12 @@ public class DistributionCardServiceImpl extends DefaultBaseService implements I @Override public List list(Map params) { - return distributionCardDao.list(params); + List distributionCardDTOs = distributionCardDao.list(params); + for(DistributionCardDTO dto : distributionCardDTOs ) { + DistributionFieldDTO fieldDTO = distributionFieldService.get(dto.getDistributionFieldId()); + dto.setFieldName(fieldDTO.getFieldName()); + } + return distributionCardDTOs; } @Override diff --git a/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java b/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java index f1a5a30..a5ee823 100644 --- a/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java +++ b/src/main/java/cn/com/tenlion/service/examination/field/IFieldService.java @@ -1,6 +1,9 @@ package cn.com.tenlion.service.examination.field; +import cn.com.tenlion.organizationmanagement.pojo.dtos.organization.OrganizationDTO; import cn.com.tenlion.pojo.bos.worktype.WorkTypeBO; +import cn.com.tenlion.pojo.dtos.field.FieldDTO; +import cn.com.tenlion.pojo.dtos.stationuser.StationUserDTO; import cn.com.tenlion.pojo.dtos.worktype.WorkTypeDTO; import cn.com.tenlion.pojo.dtos.worktype.WorkTypeZTreeDTO; import cn.com.tenlion.pojo.pos.worktype.WorkTypePO; @@ -20,5 +23,20 @@ import java.util.Map; **/ public interface IFieldService { + /** + * 分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); + + /** + * 列表 + * + * @param params + * @return + */ + List list(Map params); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java b/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java new file mode 100644 index 0000000..791bc8f --- /dev/null +++ b/src/main/java/cn/com/tenlion/service/examination/field/impl/FieldServiceImpl.java @@ -0,0 +1,102 @@ +package cn.com.tenlion.service.examination.field.impl; + +import cn.com.tenlion.dao.examination.stationuser.IStationUserDao; +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.dtos.field.FieldDTO; +import cn.com.tenlion.service.examination.field.IFieldService; +import cn.com.tenlion.service.examination.stationuser.IStationUserService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: FieldServiceImpl + * @Description: + * @Author: CodeFactory + * @Date: 2021-05-02 15:19:56 + * @Version: 3.0 + **/ +@Service +public class FieldServiceImpl extends DefaultBaseService implements IFieldService { + + @Autowired + private IStationUserDao stationUserDao; + @Autowired + private IStationUserService iStationUserService; + @Autowired + private IOrganizationService iOrganizationService; + @Autowired + private IInstitutionService iInstitutionService; + + @Override + public SuccessResultList> listPage(ListPage page) { + /** + * 查出当前人员绑定的考点人员配置 + * 只显示已经绑定考点的信息 + */ + String userId = securityComponent.getCurrentUser().getUserId(); + List stationIdList = iStationUserService.getStationByUserId(userId); + /** + * 防止无权限的人员进行查看 + */ + PageHelper.startPage(page.getPage(), page.getRows()); + if(stationIdList == null || stationIdList.size() < 1 && !"1".equals(userId)) { + List organizationDTOs = new ArrayList(); + PageInfo pageInfo = new PageInfo<>(organizationDTOs); + return new SuccessResultList<>(organizationDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + List organizationDTOs = iOrganizationService.list(page.getParams()); + List fieldDTOs = new ArrayList(); + for(OrganizationDTO dto : organizationDTOs){ + FieldDTO fieldDTO = new FieldDTO(); + fieldDTO.setOrganizationId(dto.getOrganizationId()); + fieldDTO.setOrganizationImage(dto.getOrganizationImage()); + fieldDTO.setOrganizationName(dto.getOrganizationName()); + fieldDTO.setOrganizationType(dto.getOrganizationType()); + fieldDTO.setOrganizationUserNum(dto.getOrganizationUserNum()); + fieldDTO.setOrganizationPrincipal(dto.getOrganizationPrincipal()); + fieldDTO.setOrganizationDesc(dto.getOrganizationDesc()); + if(!StringUtils.isEmpty(dto.getOrganizationType())) { + InstitutionDTO institutionDTO = iInstitutionService.get(dto.getOrganizationType()); + fieldDTO.setFieldName(institutionDTO.getInstitutionName()); + } + fieldDTOs.add(fieldDTO); + } + PageInfo pageInfo = new PageInfo<>(fieldDTOs); + return new SuccessResultList<>(fieldDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public List list(Map params) { + List organizationDTOs = iOrganizationService.list(params); + List fieldDTOs = new ArrayList(); + for(OrganizationDTO dto : organizationDTOs){ + FieldDTO fieldDTO = new FieldDTO(); + fieldDTO.setOrganizationId(dto.getOrganizationId()); + fieldDTO.setOrganizationImage(dto.getOrganizationImage()); + fieldDTO.setOrganizationName(dto.getOrganizationName()); + fieldDTO.setOrganizationType(dto.getOrganizationType()); + fieldDTO.setOrganizationUserNum(dto.getOrganizationUserNum()); + fieldDTO.setOrganizationPrincipal(dto.getOrganizationPrincipal()); + fieldDTO.setOrganizationDesc(dto.getOrganizationDesc()); + if(!StringUtils.isEmpty(dto.getOrganizationType())) { + InstitutionDTO institutionDTO = iInstitutionService.get(dto.getOrganizationType()); + fieldDTO.setFieldName(institutionDTO.getInstitutionName()); + } + fieldDTOs.add(fieldDTO); + } + return fieldDTOs; + } + +} \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml b/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml index e1d7464..822d5d5 100644 --- a/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml +++ b/src/main/resources/mybatis/mapper/distribution/distribution-mapper.xml @@ -6,6 +6,8 @@ + + @@ -24,6 +26,8 @@ + + @@ -42,6 +46,8 @@ + + @@ -68,6 +74,8 @@ t1.plan_name, t1.station_id, t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time, t1.creator, t1.gmt_create, t1.modifier, @@ -92,6 +100,8 @@ plan_name, station_id distribution_allot_time, + distribution_end_time, + distribution_allot_end_time, creator, gmt_create, modifier, @@ -108,6 +118,8 @@ #{planName}, #{stationId}, #{distributionAllotTime}, + #{distributionEndTime}, + #{distributionAllotEndTime}, #{creator}, #{gmtCreate}, #{modifier}, @@ -171,6 +183,12 @@ station_id = #{stationId}, + + distribution_end_time = #{distributionEndTime}, + + + distribution_allot_end_time = #{distributionAllotEndTime}, + plan_name = #{planName}, @@ -193,7 +211,9 @@ t1.distribution_id, t1.plan_name, t1.station_id, - t1.distribution_allot_time + t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time FROM e_distribution t1 WHERE @@ -217,6 +237,8 @@ t1.plan_name, t1.station_id, t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time, t1.creator, t1.gmt_create, t1.modifier, @@ -245,6 +267,8 @@ t1.plan_name, t1.station_id, t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time, t1.creator, t1.gmt_create, t1.modifier, @@ -273,6 +297,8 @@ t1.plan_name, t1.station_id, t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time, t1.creator, t1.gmt_create, t1.modifier, @@ -286,7 +312,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.plan_name LIKE CONCAT('%', #{keywords}, '%') ) @@ -331,6 +357,8 @@ t1.plan_name, t1.station_id, t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time, t1.creator, t1.gmt_create, t1.modifier, @@ -376,6 +404,8 @@ t1.plan_name, t1.station_id, t1.distribution_allot_time, + t1.distribution_end_time, + t1.distribution_allot_end_time, t1.creator, t1.gmt_create, t1.modifier, diff --git a/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml b/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml index 31f9943..b978ec0 100644 --- a/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml +++ b/src/main/resources/mybatis/mapper/distributioncard/distribution-card-mapper.xml @@ -11,6 +11,10 @@ + + + + @@ -27,6 +31,10 @@ + + + + @@ -43,6 +51,10 @@ + + + + @@ -61,6 +73,10 @@ distribution_card_number, distribution_card_user_id, distribution_card_user_name, + distribution_card_user_sex, + distribution_card_user_identity, + distribution_card_user_result, + distribution_card_user_status, creator, gmt_create, modifier, @@ -75,6 +91,10 @@ #{distributionCardNumber}, #{distributionCardUserId}, #{distributionCardUserName}, + #{distributionCardUserSex}, + #{distributionCardUserIdentity}, + #{distributionCardUserResult}, + #{distributionCardUserStatus}, #{creator}, #{gmtCreate}, #{modifier}, @@ -152,7 +172,11 @@ t1.distribution_card_number, t1.distribution_card_user_id, t1.distribution_card_user_name, - t1.distribution_card_id + t1.distribution_card_id, + t1.distribution_card_user_sex, + t1.distribution_card_user_identity, + t1.distribution_card_user_result, + t1.distribution_card_user_status FROM e_distribution_card t1 WHERE @@ -174,6 +198,10 @@ t1.distribution_card_number, t1.distribution_card_user_id, t1.distribution_card_user_name, + t1.distribution_card_user_sex, + t1.distribution_card_user_identity, + t1.distribution_card_user_result, + t1.distribution_card_user_status, t1.creator, t1.gmt_create, t1.modifier, @@ -200,6 +228,10 @@ t1.distribution_card_number, t1.distribution_card_user_id, t1.distribution_card_user_name, + t1.distribution_card_user_sex, + t1.distribution_card_user_identity, + t1.distribution_card_user_result, + t1.distribution_card_user_status, t1.creator, t1.gmt_create, t1.modifier, @@ -226,6 +258,10 @@ t1.distribution_card_number, t1.distribution_card_user_id, t1.distribution_card_user_name, + t1.distribution_card_user_sex, + t1.distribution_card_user_identity, + t1.distribution_card_user_result, + t1.distribution_card_user_status, t1.creator, t1.gmt_create, t1.modifier, @@ -236,6 +272,9 @@ e_distribution_card t1 WHERE t1.is_delete = 0 + + AND t1.distribution_id = #{distributionId} + AND t1.distribution_card_user_id = #{distributionCardUserId} @@ -278,6 +317,10 @@ t1.distribution_card_number, t1.distribution_card_user_id, t1.distribution_card_user_name, + t1.distribution_card_user_sex, + t1.distribution_card_user_identity, + t1.distribution_card_user_result, + t1.distribution_card_user_status, t1.creator, t1.gmt_create, t1.modifier, @@ -321,6 +364,10 @@ t1.distribution_card_number, t1.distribution_card_user_id, t1.distribution_card_user_name, + t1.distribution_card_user_sex, + t1.distribution_card_user_identity, + t1.distribution_card_user_result, + t1.distribution_card_user_status, t1.creator, t1.gmt_create, t1.modifier, diff --git a/src/main/resources/static/route/examination/distribution/list.html b/src/main/resources/static/route/examination/distribution/list.html index 1606a54..3d75c6d 100644 --- a/src/main/resources/static/route/examination/distribution/list.html +++ b/src/main/resources/static/route/examination/distribution/list.html @@ -26,6 +26,13 @@
+
+ +
@@ -65,7 +72,7 @@ var laydate = layui.laydate; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/distribution/listpage?distributionStatus=1'; + var tableUrl = 'api/distribution/listpage'; // 初始化表格 function initTable() { @@ -147,6 +154,12 @@ return '考场分配'; } } + }, + {field:'distributionCardButton',fixed: 'right', width:150, title: '准考证信息', align:'center', + templet: function(row) { + var rowData = row[this.field]; + return '准考证信息'; + } } ] ], @@ -168,7 +181,8 @@ where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), - endTime: $('#endTime').val() + endTime: $('#endTime').val(), + distributionStatus: $('#distributionStatus').val() }, page: { curr: currentPage @@ -228,6 +242,17 @@ } }); } + if(layEvent === 'distributionCardButton') { + top.dialog.open({ + url: top.restAjax.path('route/examination/distributioncard/list.html?distributionId={distributionId}', [data.distributionId]), + title: "准考证信息", + width: '80%', + height: '80%', + onClose: function() { + reloadTable(); + } + }); + } }); // 事件 - 页面变化 diff --git a/src/main/resources/static/route/examination/distribution/update.html b/src/main/resources/static/route/examination/distribution/update.html index 499b5cf..0d951a3 100644 --- a/src/main/resources/static/route/examination/distribution/update.html +++ b/src/main/resources/static/route/examination/distribution/update.html @@ -36,15 +36,25 @@
- +
- + +
+
+ +
+
- +
- + +
+
+ +
+
@@ -119,6 +129,15 @@ trigger: 'click' }); } + // 初始化成立日期时间戳 + function initDistributionAllotTime() { + laydate.render({ + elem: '#distributionAllotEndTime', + type: 'datetime', + min:3, + trigger: 'click' + }); + } function refreshDownloadTemplet(fileName, file) { var dataRander = {}; diff --git a/src/main/resources/static/route/examination/distributioncard/list.html b/src/main/resources/static/route/examination/distributioncard/list.html new file mode 100644 index 0000000..d8e51e7 --- /dev/null +++ b/src/main/resources/static/route/examination/distributioncard/list.html @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/examination/distributioncard/save.html b/src/main/resources/static/route/examination/distributioncard/save.html new file mode 100644 index 0000000..55b3a64 --- /dev/null +++ b/src/main/resources/static/route/examination/distributioncard/save.html @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/examination/distributioncard/update.html b/src/main/resources/static/route/examination/distributioncard/update.html new file mode 100644 index 0000000..25a3817 --- /dev/null +++ b/src/main/resources/static/route/examination/distributioncard/update.html @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/examination/field/listpage.html b/src/main/resources/static/route/examination/field/listpage.html new file mode 100644 index 0000000..8d87e30 --- /dev/null +++ b/src/main/resources/static/route/examination/field/listpage.html @@ -0,0 +1,314 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+ + +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/examination/field/save.html b/src/main/resources/static/route/examination/field/save.html index 5052cc4..c67c843 100644 --- a/src/main/resources/static/route/examination/field/save.html +++ b/src/main/resources/static/route/examination/field/save.html @@ -56,7 +56,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
diff --git a/src/main/resources/static/route/examination/field/update.html b/src/main/resources/static/route/examination/field/update.html index efa7bb2..f6396a9 100644 --- a/src/main/resources/static/route/examination/field/update.html +++ b/src/main/resources/static/route/examination/field/update.html @@ -56,7 +56,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
diff --git a/src/main/resources/static/route/examination/station/list.html b/src/main/resources/static/route/examination/station/list.html index 58c8095..d98900c 100644 --- a/src/main/resources/static/route/examination/station/list.html +++ b/src/main/resources/static/route/examination/station/list.html @@ -87,7 +87,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'institutionImage', width: 180, title: '考点图片', align:'center', + {field: 'institutionImage', width: 180, title: '机构图片', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -107,7 +107,7 @@ return value; } }, - {field: 'institutionName', width: 180, title: '考点名称', align:'center', + {field: 'institutionName', width: 180, title: '机构名称', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -116,7 +116,7 @@ return rowData; } }, - {field: 'institutionFoundingTime', width: 180, title: '考点成立时间', align:'center', + {field: 'institutionFoundingTime', width: 180, title: '机构成立时间', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -125,7 +125,7 @@ return rowData; } }, - {field: 'institutionPrincipal', width: 180, title: '考点负责人', align:'center', + {field: 'institutionPrincipal', width: 180, title: '机构负责人', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -134,7 +134,7 @@ return rowData; } }, - {field: 'institutionAddress', width: 350, title: '考点详情地址', align:'center', + {field: 'institutionAddress', width: 350, title: '机构详情地址', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -149,10 +149,10 @@ return '考场管理'; } }, - {field:'institutionUserButton',fixed: 'right', width:150, title: '人员管理', align:'center', + {field:'institutionUserButton',fixed: 'right', width:150, title: '机构人员管理', align:'center', templet: function(row) { var rowData = row[this.field]; - return '人员管理'; + return '机构人员管理'; } } ] diff --git a/src/main/resources/static/route/examination/station/save.html b/src/main/resources/static/route/examination/station/save.html index fde8cd2..93a518d 100644 --- a/src/main/resources/static/route/examination/station/save.html +++ b/src/main/resources/static/route/examination/station/save.html @@ -36,9 +36,9 @@
- +
- +
@@ -57,9 +57,9 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
- +
@@ -68,9 +68,9 @@
- +
- +
@@ -80,21 +80,21 @@
- +
- +
- +
- +
- +
- +
@@ -128,9 +128,9 @@
- - - + + +
@@ -224,7 +224,7 @@ } } - // 初始化考点图片图片上传 + // 初始化机构图片图片上传 function initInstitutionImageUploadFile() { var files = $('#institutionImage').val(); initFileList('institutionImage', files, function(fileName) { diff --git a/src/main/resources/static/route/examination/station/update.html b/src/main/resources/static/route/examination/station/update.html index 8d4b15b..85c14c5 100644 --- a/src/main/resources/static/route/examination/station/update.html +++ b/src/main/resources/static/route/examination/station/update.html @@ -36,9 +36,9 @@
- +
- +
@@ -57,9 +57,9 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
- +
@@ -68,9 +68,9 @@
- +
- +
@@ -80,21 +80,21 @@
- +
- +
- +
- +
- +
- +
@@ -128,9 +128,9 @@
- - - + + +