|
|
|
|
@ -2,9 +2,6 @@ package org.jeecg.modules.demo.expert.controller; |
|
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
import java.io.IOException; |
|
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
|
import java.net.URLDecoder; |
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
|
|
@ -13,13 +10,13 @@ import org.apache.shiro.SecurityUtils; |
|
|
|
|
import org.jeecg.common.api.vo.Result; |
|
|
|
|
import org.jeecg.common.constant.CommonConstant; |
|
|
|
|
import org.jeecg.common.system.query.QueryGenerator; |
|
|
|
|
import org.jeecg.common.system.query.QueryRuleEnum; |
|
|
|
|
import org.jeecg.common.system.vo.LoginUser; |
|
|
|
|
import org.jeecg.common.util.PasswordUtil; |
|
|
|
|
import org.jeecg.common.util.oConvertUtils; |
|
|
|
|
import org.jeecg.modules.demo.disciplinefieid.entity.DisciplineFieid; |
|
|
|
|
import org.jeecg.modules.demo.disciplinefieid.service.IDisciplineFieidService; |
|
|
|
|
import org.jeecg.modules.demo.expert.entity.ExpCmsVo; |
|
|
|
|
import org.jeecg.modules.demo.expert.entity.ExpDepVos; |
|
|
|
|
import org.jeecg.modules.demo.expert.entity.ExpdefVo; |
|
|
|
|
import org.jeecg.modules.demo.expert.entity.Expert; |
|
|
|
|
import org.jeecg.modules.demo.expert.service.IExpertService; |
|
|
|
|
@ -38,22 +35,13 @@ import org.jeecg.modules.system.entity.SysDepart; |
|
|
|
|
import org.jeecg.modules.system.entity.SysUser; |
|
|
|
|
import org.jeecg.modules.system.service.ISysDepartService; |
|
|
|
|
import org.jeecg.modules.system.service.ISysUserService; |
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil; |
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
|
|
|
|
import org.jeecgframework.poi.excel.entity.ExportParams; |
|
|
|
|
import org.jeecgframework.poi.excel.entity.ImportParams; |
|
|
|
|
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; |
|
|
|
|
import org.jeecg.common.system.base.controller.JeecgController; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest; |
|
|
|
|
import org.springframework.web.servlet.ModelAndView; |
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog; |
|
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @Description: 专家管理 |
|
|
|
|
@ -632,7 +620,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
|
if (expert.getCompopen().equals("1")) { |
|
|
|
|
//修改提交审核状态
|
|
|
|
|
expertService.handlebackbackfirm(id); |
|
|
|
|
str ="驳回审核！请到编辑页面确定问题数据并填写驳回原因"; |
|
|
|
|
str ="驳回审核！"; |
|
|
|
|
} else if (expert.getCompopen().equals("3") || expert.getCompopen().equals("2") ) { |
|
|
|
|
str ="已驳回或者是已通过审核"; |
|
|
|
|
} |
|
|
|
|
@ -928,14 +916,23 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
|
expertService.updateById(expert); |
|
|
|
|
return Result.OK("驳回成功，已责令专家重新编辑!"); |
|
|
|
|
} |
|
|
|
|
@AutoLog(value = "专家管理-公司驳回") |
|
|
|
|
@ApiOperation(value="专家管理-公司驳回", notes="专家管理-公司驳回") |
|
|
|
|
@RequestMapping(value = "/saveOrUpdatefimebh", method = {RequestMethod.PUT,RequestMethod.POST}) |
|
|
|
|
public Result<String> saveOrUpdatefimebh(@RequestBody Expert expert) { |
|
|
|
|
expert.setCompopen("3"); |
|
|
|
|
|
|
|
|
|
expertService.updateById(expert); |
|
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
|
@AutoLog(value = "查找法人部门") |
|
|
|
|
@ApiOperation(value="查找法人部门", notes="查找法人部门") |
|
|
|
|
@GetMapping(value = "/getdepdata") |
|
|
|
|
public Result< List<ExpDepVos>> getdepdata() { |
|
|
|
|
List<SysDepart> departs = sysDepartService.list(); |
|
|
|
|
List<SysDepart> departstemp = departs.stream() |
|
|
|
|
.filter(depart -> depart.getDepartNameAbbr() != null && !depart.getDepartNameAbbr().isEmpty()) |
|
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
List<ExpDepVos> expDepVos =new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
for (SysDepart depart : departstemp) { |
|
|
|
|
ExpDepVos expDepVo =new ExpDepVos(); |
|
|
|
|
expDepVo.setDepid(depart.getId()); |
|
|
|
|
expDepVo.setDepname(depart.getDepartName()); |
|
|
|
|
expDepVos.add(expDepVo); |
|
|
|
|
} |
|
|
|
|
return Result.OK(expDepVos); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
