diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index fd87ae15..ae19dfea 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/login","/wechat/**", "/common/**", "/register", "/captchaImage", "/weixin/**","/bgscreen/**","/publics/**","/system/dict/data/**").permitAll() + .antMatchers("/login","/wechat/**", "/common/**", "/register", "/captchaImage","/bgscreen/**","/publics/**","/system/dict/data/**").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/**/img/**", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/ruoyi-wechat/pom.xml b/ruoyi-wechat/pom.xml index 3ea9e806..22557c42 100644 --- a/ruoyi-wechat/pom.xml +++ b/ruoyi-wechat/pom.xml @@ -18,10 +18,10 @@ - + - org.springframework.boot - spring-boot-starter-thymeleaf + com.ruoyi + ruoyi-framework @@ -30,12 +30,6 @@ mysql-connector-java - - - com.ruoyi - ruoyi-framework - - com.yanzhu.jh yanzhu-jh @@ -43,11 +37,6 @@ compile - - org.springframework - spring-test - - diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java similarity index 97% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java index eddd067f..8dfc3b83 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.project; +package com.ruoyi.web.project.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -63,4 +63,5 @@ public class ProjectCheckingController extends BaseController { { return toAjax(surProjectCheckingService.deleteSurProjectCheckingById(id)); } + } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java new file mode 100644 index 00000000..b29a62ba --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java @@ -0,0 +1,81 @@ +package com.ruoyi.web.project.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.web.project.service.WxIProjectInfoService; +import com.yanzhu.jh.project.service.ISurProjectUserinfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @version : V1.0 + * @ClassName: ProjectProblemmodifyController + * @Description: 项目问题修改 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/project") +public class ProjectController extends BaseController { + + @Autowired + WxIProjectInfoService IProjectInfoService; + + /** + * Methods + * @describe 描述：查询项目的基本信息 + * @author 作者：Makalu + * @date 时间：2020/7/8 9:16 + * @version 版本： V1.0 + * @param id：String + * @return 返回值： + * @throws Exception 异常： + */ + @RequestMapping("/getProjectFoundation") + public Map getProjectFoundation(@RequestParam String id) { + return IProjectInfoService.getProjectBasicInfo(id); + } + + /*** + * 查询下一级组织架构信息 + * @param param + * @return + */ + @RequestMapping("/selectDeptSubordinate") + public Object selectDeptSubordinate(@RequestParam Map param){ + return IProjectInfoService.selectDeptSubordinate(param); + } + + /** + * @describe 根据公司获取项目的列表 + */ + @RequestMapping("/selectProjectByCompanyId") + public Object selectProjectByCompanyId(@RequestParam Map map) { + return IProjectInfoService.getProjectByDeptIdAndCompanyId(map); + } + + /** + * 获取建设单位 + * @param projectId + * @return + */ + @RequestMapping("/getProjectUnitList") + public Object getProjectUnitList(String projectId){ + return IProjectInfoService.getProjectUnitList(projectId); + } + + /*** + * 模糊查询出项目信息 + * @param map + * @return + */ + @RequestMapping("selectProjectInfoByName") + public AjaxResult selectProjectInfoByName(@RequestParam Map map){ + return success(IProjectInfoService.getProjectByDeptIdAndCompanyId(map)); + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java similarity index 99% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java index 404a28e6..7230492a 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.project; +package com.ruoyi.web.project.controller; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -24,8 +24,6 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/wechat/projectProblemmodify") - - public class ProjectProblemmodifyController extends BaseController { @Autowired diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java similarity index 97% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java index c917d883..01e1a625 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.project; +package com.ruoyi.web.project.controller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/domain/WxProjectInfo.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/domain/WxProjectInfo.java similarity index 99% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/domain/WxProjectInfo.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/domain/WxProjectInfo.java index e19809d3..3c2b5cdb 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/domain/WxProjectInfo.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/domain/WxProjectInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.projectInfo.domain; +package com.ruoyi.web.project.domain; import com.ruoyi.common.core.domain.BaseEntity; diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java new file mode 100644 index 00000000..84989715 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java @@ -0,0 +1,57 @@ +package com.ruoyi.web.project.mapper; + +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Repository +public interface WxProjectInfoMapper { + + //查询组织架构下一层级 + List> getDeptSubordinate(Map map); + //查询区级层级 + List> getQUDeptSubordinate(Map map); + //根据所选层级或者公司查询登录用户的项目 + List> getProjectByDeptIdAndCompanyId(Map map); + /** + * Methods + * @describe 描述：查询项目的概况信息 + * @author 作者：Makalu + * @date 时间：2020/7/7 16:21 + * @version 版本： V1.0 + * @param id：String + * @return 返回值：map + * @throws Exception 异常：none + */ + public Map selectProjectOverview(String id); + + /** + * 获取建设单位 + * @param projectId + * @return + */ + List> getProjectUnitList(String projectId); + + /** + * 查询子公司信息 + * @param map + * @return + */ + List> getZGSDeptInfoByMap(Map map); + + /** + * 根据项目查询单位信息 + * @param projectId + * @return + */ + Map selectDeptByProjectId(Long projectId); + + /** + * 根据登录用户查询单位信息 + * @param userName + * @return + */ + Map selectDeptByUserName(String userName); + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java new file mode 100644 index 00000000..2beaa3b4 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java @@ -0,0 +1,43 @@ +package com.ruoyi.web.project.service; + +import java.util.List; +import java.util.Map; + +public interface WxIProjectInfoService { + + + /** + * 查询组织下一层级 + * @param map + * @return + */ + Map selectDeptSubordinate(Map map); + + /** + * 根据所选层级查询登录用户的项目 + * @param map + * @return + */ + List> getProjectByDeptIdAndCompanyId(Map map); + + /** + * Methods + * @describe 描述：获取项目的基本信息 + * @author 作者：Makalu + * @date 时间：2020/7/7 17:59 + * @version 版本： V1.0 + * @param id：String + * @return 返回值：map + * @throws Exception 异常：none + */ + public Map getProjectBasicInfo(String id); + + /** + * 获取建设单位 + * @param projectId + * @return + */ + List> getProjectUnitList(String projectId); + + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java new file mode 100644 index 00000000..d798ce35 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java @@ -0,0 +1,118 @@ +package com.ruoyi.web.project.service.impl; + +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DeptTypeEnum; +import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.mapper.SysRoleMapper; +import com.ruoyi.web.project.mapper.WxProjectInfoMapper; +import com.ruoyi.web.project.service.WxIProjectInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author wxw + * @version : V1.0 + * @ClassName: ProjectInfoServiceImpl + * @Description: TODO + * @Auther: Makalu + * @Date: 2020/7/7 16:45 + */ +@Service +public class WxProjectInfoServiceImpl implements WxIProjectInfoService { + + @Autowired + private WxProjectInfoMapper ProjectInfoMapper; + + @Autowired + private SysDeptMapper sysDeptMapper; + + @Autowired + private SysRoleMapper sysRoleMapper; + + @Override + public Map selectDeptSubordinate(Map param) { + List> deptList = ProjectInfoMapper.getDeptSubordinate(param); + Map dataMap = new HashMap<>(16); + for(Map map:deptList){ + map.put("userId",param.get("userId")); + dataMap.put(map.get("text").toString(),ProjectInfoMapper.getQUDeptSubordinate(map)); + } + return dataMap; + } + + @Override + public List> getProjectByDeptIdAndCompanyId(Map map) { + List> list = new ArrayList<>(); + String nowRole = null; + if(map.get("minRoleId")!=null && !"undefined".equals(map.get("minRoleId"))){ + nowRole = map.get("minRoleId").toString(); + }else{ + nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId")))); + } + if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ + Long deptId = this.getZgsDept(Convert.toLong(map.get("deptId"))).getDeptId(); + map.put("nowDeptId",Convert.toStr(deptId)); + }else{ + map.put("nowDeptId",Convert.toStr(map.get("deptId"))); + } + //当前角色时管理员时，修改角色为集团公司 + if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){ + nowRole = SysRoleEnum.JTGS.getCode(); + } + map.put("nowRole",nowRole); + List> getProjec = ProjectInfoMapper.getProjectByDeptIdAndCompanyId(map); + for(int i=0;i getProjectBasicInfo(String id) { + //根据项目的id查基本信息 + return ProjectInfoMapper.selectProjectOverview(id); + } + + @Override + public List> getProjectUnitList(String projectId) { + return ProjectInfoMapper.getProjectUnitList(projectId); + } + + /** + * 查询子公司部门ID + * + * @param deptId 部门ID + * @return 结果 + */ + private SysDept getZgsDept(Long deptId){ + SysDept sysDept = sysDeptMapper.selectDeptById(deptId); + if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ + //comFlag标识为1是子公司 + if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){ + return sysDept; + }else{ + return getZgsDept(sysDept.getParentId()); + } + }else{ + return sysDept; + } + } +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java deleted file mode 100644 index c9ad6609..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.ruoyi.web.projectInfo.controller; - -import com.ruoyi.web.projectInfo.service.WxIProjectInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; -import java.util.Map; - -/** - * @version : V1.0 - * @ClassName: ProjectInfoController - * @Description: TODO - * @Auther: Makalu - * @Date: 2020/7/7 18:03 - */ -@Controller -@RequestMapping("/weixin/projectInfo") -public class WxProjectInfoController { - - @Autowired - private WxIProjectInfoService IProjectInfoService; - - /** - * 查询登录用户的组织架构 - * @param map - * @return - */ - @RequestMapping("/selectDeptAll") - @ResponseBody - public Object selectDeptAll(@RequestParam Map map){ - return IProjectInfoService.getDeptAll(map); - } - - /*** - * 查询下一级组织架构信息 - * @param param - * @return - */ - @RequestMapping("/selectDeptSubordinate") - @ResponseBody - public Object selectDeptSubordinate(@RequestParam Map param){ - return IProjectInfoService.selectDeptSubordinate(param); - } - - /** - * @describe 根据层级获取项目的列表 - */ - @ResponseBody - @RequestMapping("/getCompanyInfo") - public Object getCompanyInfo(@RequestParam Map map) { - return IProjectInfoService.getProjectByDeptIdAndCompanyId(map); - } - - /** - * @describe 根据公司获取项目的列表 - */ - @ResponseBody - @RequestMapping("/selectProjectByCompanyId") - public Object selectProjectByCompanyId(@RequestParam Map map) { - return IProjectInfoService.getProjectByDeptIdAndCompanyId(map); - } - - /** - * 根据组织架构查询出公司列表 - * @param map - * @return - */ - @ResponseBody - @RequestMapping("/selectCompanyJG") - public Object selectCompanyJG(@RequestParam Map map) { - return IProjectInfoService.getDeptIdNext(map); - } - - /** - * Methods - * @describe 描述：查询项目的经纬度 - * @author 作者：Makalu - * @date 时间：2020/7/7 20:07 - * @version 版本： V1.0 - * @param map：map - * @return 返回值： - * @throws Exception 异常： - */ - @ResponseBody - @RequestMapping("/getProjectPoint") - public Map getProjectPoint(@RequestParam Map map) { - return IProjectInfoService.getProjectPointCount(map); - } - - /** - * Methods - * @describe 描述：查询项目的列表信息 - * @author 作者：Makalu - * @date 时间：2020/7/8 9:25 - * @version 版本： V1.0 - * @param map：map - * @return 返回值： - * @throws Exception 异常： - */ - @ResponseBody - @RequestMapping("/getProjectList") - public List> getProjectList(@RequestParam Map map) { - return IProjectInfoService.getProjectList(map); - } - - /** - * Methods - * @describe 描述：查询项目的基本信息 - * @author 作者：Makalu - * @date 时间：2020/7/8 9:16 - * @version 版本： V1.0 - * @param id：String - * @return 返回值： - * @throws Exception 异常： - */ - @ResponseBody - @RequestMapping("/getProjectFoundation") - public Map getProjectFoundation(@RequestParam String id) { - return IProjectInfoService.getProjectBasicInfo(id); - } - - /** - * Methods - * @describe 描述：查询项目的管理公司信息 - * @author 作者：Makalu - * @date 时间：2020/7/8 9:19 - * @version 版本： V1.0 - * @param id：String - * @return 返回值： - * @throws Exception 异常： - */ - @ResponseBody - @RequestMapping("/getProjectManage") - public Map getProjectManage(@RequestParam String id) { - return IProjectInfoService.getProjectManageInfo(id); - } - - /*** - * 模糊查询出项目信息 - * @param map - * @return - */ - @RequestMapping("selectProjectInfoByName") - @ResponseBody - public Object selectProjectInfoByName(@RequestParam Map map){ - return IProjectInfoService.getProjectInfoByName(map); - } - - /** - * 获取建设单位 - * @param projectId - * @return - */ - @RequestMapping("/getProjectUnitList") - @ResponseBody - public Object getProjectUnitList(String projectId){ - return IProjectInfoService.getProjectUnitList(projectId); - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java deleted file mode 100644 index ea485e1b..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.ruoyi.web.projectInfo.mapper; - -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -@Repository -public interface WxProjectInfoMapper { - - //查询出人员类型信息 - List getPostIdByUserId(String userId); - //查询组织架构下一层级 - List> getDeptSubordinate(Map map); - //查询区级层级 - List> getQUDeptSubordinate(Map map); - ///根据组织架构id查询数据 - Map getDeptData(String deptId); - //查询出项目用户公司项目信息 - Map getCompanyAndProjectByUserId(String userId); - //查询所有省级 - List> getShengList(Map map); - //根据所选层级或者公司查询登录用户的项目 - List> getProjectByDeptIdAndCompanyId(Map map); - //根据登录账号查询出企业信息 - Map getCompanyByUserId(Map map); - //企业人员根据组织架构查询出公司列表 - List> getCompanyQY(Map map); - //根据公司id查询出公司名称 - Map getCompanyInfo(String superiorCompany); - //监管人员根据组织架构查询出公司列表 - List> getCompanyJG(Map map); - //根据总公司层级查询出集团公司列表 - List> getCompanySonData(Map map); - //查询上一级公司 - Map getNextLevelCompany(Map map); - - - /** - * Methods - * @describe 描述：查询项目的经度纬度列表 - * @author 作者：Makalu - * @date 时间：2020/7/7 15:48 - * @version 版本： V1.0 - * @param deptId：String - * @return 返回值：list - * @throws Exception 异常：none - */ - public List> selectProjectPoint(String deptId); - - /** - * Methods - * @describe 描述：查询建设单位下的项目个数 - * @author 作者：Makalu - * @date 时间：2020/7/7 15:44 - * @version 版本： V1.0 - * @param deptId：map - * @return 返回值：int - * @throws Exception 异常：none - */ - public int selectProjectSize(String deptId); - - /** - * Methods - * @describe 描述：查询项目的基本信息 - * @author 作者：Makalu - * @date 时间：2020/7/7 10:57 - * @version 版本： V1.0 - * @param map：map - * @return 返回值：list - * @throws Exception 异常：none - */ - public List> selectProjectInfo(Map map); - - /** - * Methods - * @describe 描述：查询项目的概况信息 - * @author 作者：Makalu - * @date 时间：2020/7/7 16:21 - * @version 版本： V1.0 - * @param id：String - * @return 返回值：map - * @throws Exception 异常：none - */ - public Map selectProjectOverview(String id); - - /** - * Methods - * @describe 描述：查询项目的管理概况 - * @author 作者：Makalu - * @date 时间：2020/7/7 16:37 - * @version 版本： V1.0 - * @param id：String - * @return 返回值：map - * @throws Exception 异常：none - */ - public Map selectProjectManage(String id); - - /** - * 模糊查询项目信息 - * @param map - * @return - */ - List> getProjectInfoByName(Map map); - - /** - * 模糊查询出预警项目 - * @param map - * @return - */ - List> getProjectInfoEnviron(Map map); - - List> getChinaProvince(); - - int addChinaCity(List> list); - - /*********************************小程序首页新逻辑**************************************/ - - /** - * 查询项目相关信息 - * @param projectId - * @return - */ - Map getProjectAndChinaData(String projectId); - - /** - * 查询公司信息 - * @return - */ - Map getDeptInfo(); - - /** - * 查询公司信息 - * @param map - * @return - */ - Map getDeptInfoByMap(Map map); - - /** - * 查询出省份信息 - * @param deptId - * @return - */ - List> getChinaProvinceList(Map deptId); - - /** - * 获取公司下一层级 - * @param map - * @return - */ - List> getDeptIdNext(Map map); - - /** - * 获取建设单位 - * @param projectId - * @return - */ - List> getProjectUnitList(String projectId); - - /** - * 查询子公司信息 - * @param map - * @return - */ - List> getZGSDeptInfoByMap(Map map); - - /** - * 获取建设单位 - * @param projectId - * @return - */ - Map selectDeptByProjectId(Long projectId); - - /** - * 获取建设单位 - * @param userName - * @return - */ - Map selectDeptByUserName(String userName); - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java deleted file mode 100644 index 2c7c33da..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.ruoyi.web.projectInfo.service; - -import java.util.List; -import java.util.Map; - -public interface WxIProjectInfoService { - - /** - * 查询用户的组织架构 - * @param map - * @return - */ - Map getDeptAll(Map map); - - /** - * 查询组织下一层级 - * @param map - * @return - */ - Map selectDeptSubordinate(Map map); - - /** - * 根据所选层级查询登录用户的项目 - * @param map - * @return - */ - List> getProjectByDeptIdAndCompanyId(Map map); - - /** - * 企业人员根据组织架构查询出公司列表 - * @param map - * @return - */ - Object getDeptIdNext(Map map); - - /** - * 监管人员根据组织架构查询公司信息 - * @param map - * @return - */ - Object getCompanyJG(Map map); - - /** - * 查询出工程列表数据 - * @param map - * @return - */ - List> getYCData(Map map); - - - - - /** - * Methods - * @describe 描述：获取项目的经纬度 - * @author 作者：Makalu - * @date 时间：2020/7/7 17:04 - * @version 版本： V1.0 - * @param map：map - * @return 返回值： - * @throws Exception 异常： - */ - public Map getProjectPointCount(Map map); - - /** - * Methods - * @describe 描述：获取公司下的所有项目列表 - * @author 作者：Makalu - * @date 时间：2020/7/7 17:49 - * @version 版本： V1.0 - * @param map：map - * @return 返回值：list - * @throws Exception 异常：none - */ - public List> getProjectList(Map map); - - /** - * Methods - * @describe 描述：获取项目的基本信息 - * @author 作者：Makalu - * @date 时间：2020/7/7 17:59 - * @version 版本： V1.0 - * @param id：String - * @return 返回值：map - * @throws Exception 异常：none - */ - public Map getProjectBasicInfo(String id); - - /** - * Methods - * @describe 描述：获取项目的管理单位信息 - * @author 作者：Makalu - * @date 时间：2020/7/7 18:00 - * @version 版本： V1.0 - * @param id：String - * @return 返回值：map - * @throws Exception 异常：none - */ - public Map getProjectManageInfo(String id); - - /** - * 模糊查询项目信息 - * @param map - * @return - */ - List> getProjectInfoByName(Map map); - - - void add(); - - - /** - * 获取建设单位 - * @param projectId - * @return - */ - List> getProjectUnitList(String projectId); - - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java deleted file mode 100644 index 7e08c856..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java +++ /dev/null @@ -1,339 +0,0 @@ -package com.ruoyi.web.projectInfo.service; - -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DeptTypeEnum; -import com.ruoyi.common.enums.SysRoleEnum; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.web.projectInfo.mapper.WxProjectInfoMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author wxw - * @version : V1.0 - * @ClassName: ProjectInfoServiceImpl - * @Description: TODO - * @Auther: Makalu - * @Date: 2020/7/7 16:45 - */ -@Service -public class WxProjectInfoServiceImpl implements WxIProjectInfoService { - - @Autowired - private WxProjectInfoMapper ProjectInfoMapper; - - @Autowired - private SysDeptMapper sysDeptMapper; - - @Autowired - private SysRoleMapper sysRoleMapper; - - @Override - public Map getDeptAll(Map map) { - //当前登录账号角色信息 - String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId")))); - Map dataMap = new HashMap<>(16); - //组装数据 - dataMap.put("shengName","西安市"); - dataMap.put("shiName","西咸新区"); - dataMap.put("quName","泾河新城"); - //公司信息 - List> list = new ArrayList<>(); - Map totalMap = new HashMap<>(16); - //查询出公司信息 - if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) ){ - List> companyList = ProjectInfoMapper.getZGSDeptInfoByMap(map); - totalMap.put("id","0"); - totalMap.put("text","泾河产业发展集团"); - list.add(totalMap); - for(Map companyMap:companyList){ - totalMap = new HashMap<>(16); - totalMap.put("id",companyMap.get("dept_id")); - totalMap.put("text",companyMap.get("dept_name")); - list.add(totalMap); - } - }else if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ - SysDept sysDept = this.getZgsDept(Convert.toLong(map.get("deptId"))); - totalMap.put("id",sysDept.getDeptId()); - totalMap.put("text",sysDept.getDeptName()); - list.add(totalMap); - }else if(SysRoleEnum.COMMON.getCode().equals(nowRole)){ - //普通角色，获取真实部门 - SysDept sysDept = this.getZgsDept(Convert.toLong(map.get("deptId"))); - //判断当前部门是否是产业发展集团 - if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag()) || DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ - sysDept = this.getZgsDept(Convert.toLong(sysDept.getDeptId())); - totalMap.put("id",sysDept.getDeptId()); - totalMap.put("text",sysDept.getDeptName()); - list.add(totalMap); - }else{ - //普通角色 - totalMap.put("id",sysDept.getDeptId()); - totalMap.put("text",sysDept.getDeptName()); - list.add(totalMap); - } - }else{ - //监理单位/总包单位/分包单位 - SysDept sysDept = sysDeptMapper.selectDeptById(Convert.toLong(map.get("deptId"))); - totalMap.put("id",sysDept.getDeptId()); - totalMap.put("text",sysDept.getDeptName()); - list.add(totalMap); - } - dataMap.put("province_list",list); - dataMap.put("deptId",map.get("deptId")); - dataMap.put("logCompanyName",list.get(0).get("text")); - dataMap.put("companyId",list.get(0).get("text")); - return dataMap; - } - - @Override - public Map selectDeptSubordinate(Map param) { - List> deptList = ProjectInfoMapper.getDeptSubordinate(param); - Map dataMap = new HashMap<>(16); - for(Map map:deptList){ - map.put("userId",param.get("userId")); - dataMap.put(map.get("text").toString(),ProjectInfoMapper.getQUDeptSubordinate(map)); - } - return dataMap; - } - - @Override - public List> getProjectByDeptIdAndCompanyId(Map map) { - List> list = new ArrayList<>(); - String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId")))); - if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ - Long deptId = this.getZgsDept(Convert.toLong(map.get("deptId"))).getDeptId(); - map.put("nowDeptId",Convert.toStr(deptId)); - }else{ - map.put("nowDeptId",Convert.toStr(map.get("deptId"))); - } - //当前角色时管理员时，修改角色为集团公司 - if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){ - nowRole = SysRoleEnum.JTGS.getCode(); - } - map.put("nowRole",nowRole); - List> getProjec = ProjectInfoMapper.getProjectByDeptIdAndCompanyId(map); - for(int i=0;i map) { - return ProjectInfoMapper.getDeptIdNext(map); - } - - @Override - public Object getCompanyJG(Map map) { - Map twoMap =new HashMap<>(); -// if("2".equals(map.get("type"))){ -// twoMap.put("startTime", DateUtil.getStartTimes()); -// twoMap.put("endTime", DateUtil.getNowEndTime()); -// } -// twoMap.put("deptId",map.get("deptId")); -// twoMap.put("num",map.get("superiorCompanyId").toString().length()+4); -// twoMap.put("num1",map.get("superiorCompanyId").toString().length()); -// twoMap.put("companyId",map.get("superiorCompanyId")); - return ProjectInfoMapper.getCompanyQY(twoMap); - } - - @Override - public List> getYCData(Map map) { -// List> list = new ArrayList<>(); -// JSONArray jsonArray = JSONArray.parseArray(map.get("projectData").toString()); -// for(int i = 0;i3) { -// Map ycMap = new HashMap<>(); -// ycMap.put("projectId", jsonArray.getJSONObject(i).getString("projectId")); -// ycMap.put("startTime", DateUtil.getStartTimes()); -// ycMap.put("endTime", DateUtil.getNowEndTime()); -// //根据项目id查询扬尘数据 -// Integer YNnum = mapper.getYangchenCount(ycMap); -// Map spMap = new HashMap<>(); -// spMap.put("projectName", jsonArray.getJSONObject(i).getString("projectName")); -// spMap.put("startTime", DateUtil.getStartTimes()); -// spMap.put("endTime", DateUtil.getNowEndTime()); -// List> shnum = projectVideoMapper.selectVideoOutline(spMap); -// Integer dayCount = 0; -// for(Map dayMap1:shnum){ -// dayCount+= Integer.valueOf(dayMap1.get("value").toString()); -// } -// //组装数据 -// Map zzMap = new HashMap<>(); -// zzMap.put("projectCount", YNnum); -// zzMap.put("videoNum", dayCount); -// zzMap.put("projectId", jsonArray.getJSONObject(i).getString("projectId")); -// zzMap.put("projectName", jsonArray.getJSONObject(i).getString("projectName")); -// zzMap.put("companyName", jsonArray.getJSONObject(i).getString("companyName")); -// zzMap.put("projectAddress", jsonArray.getJSONObject(i).getString("projectAddress")); -// list.add(zzMap); -// } -// } - return null;//list; - } - - - @Override - public Map getProjectPointCount(Map map) { - //返回的Map -// Map resultMap = new HashMap<>(16); -// //根据选中的公司deptId查询所有的项目经纬度，和项目的总数 -// List> list = new ArrayList<>(); -// List> getProjectPoint = ProjectInfoMapper.selectProjectPoint(map.get("deptId").toString()); -// for(int i=0;i> getProjectList(Map map) { - List> list = new ArrayList<>(); -// //根据参数查询所有的项目列表 -// List> proList = ProjectInfoMapper.selectProjectInfo(map); -// proList.forEach(proMap->{ -// //查询出预警信息预警 -// Map PM25Map = new HashMap<>(); -// PM25Map.put("projectId",proMap.get("streamNumber")); -// PM25Map.put("startTime", DateUtil.getStartTimes()); -// PM25Map.put("endTime", DateUtil.getNowEndTime()); -// int envirCount = mapper.getEarlyWarning(PM25Map); -// -// //查询实时接入数据 -// String videoNum = mapper.selectVideoByProjectName(proMap.get("name").toString()); -// -// //组装数据 -// Map dataMap = new HashMap<>(); -// dataMap.put("id",proMap.get("id")); -// dataMap.put("engineeringName",proMap.get("engineeringName")); -// dataMap.put("name",proMap.get("name")); -// dataMap.put("projectAddress",proMap.get("projectAddress")); -// dataMap.put("streamNumber",proMap.get("streamNumber")); -// dataMap.put("envirCount",envirCount); -// dataMap.put("videoNum",(videoNum == null)?'0':videoNum); -// list.add(dataMap); -// }); - return list; - } - - @Override - public Map getProjectBasicInfo(String id) { - //根据项目的id查基本信息 - return ProjectInfoMapper.selectProjectOverview(id); - } - - @Override - public Map getProjectManageInfo(String id) { - //根据项目的id查询管理信息 - return ProjectInfoMapper.selectProjectManage(id); - } - - @Override - public List> getProjectInfoByName(Map map) { - List> list = new ArrayList<>(); - //1所有项目 2 预警项目 -// List> getProjec = ProjectInfoMapper.getProjectInfoByName(map); -// for(int i=0;i> list = ProjectInfoMapper.getChinaProvince(); -// for(Map map:list){ -// try { -// OkHttpClient client = new OkHttpClient().newBuilder() -// .build(); -// Request request = new Request.Builder() -// .url("http://datavmap-public.oss-cn-hangzhou.aliyuncs.com/areas/csv/"+map.get("adcode").toString()+"_district.json") -// .method("GET", null) -// .build(); -// Response response = client.newCall(request).execute(); -// String json = response.body().string(); -// System.out.println(json); -// System.out.println("id=="+map.get("id")); -// JSONArray object = JSON.parseObject(json).getJSONArray("rows"); -// List> list1 = new ArrayList<>(); -// for(int i = 0;i data = new HashMap<>(16); -// data.put("areaName",object.getJSONObject(i).getString("name")); -// data.put("provinceId",map.get("provinceId")); -// data.put("provinceName",map.get("provinceName")); -// data.put("cityId",map.get("id")); -// data.put("cityName",object.getJSONObject(i).getString("parent")); -// data.put("adcode",object.getJSONObject(i).getString("adcode")); -// data.put("lat",object.getJSONObject(i).getString("lat")); -// data.put("lng",object.getJSONObject(i).getString("lng")); -// list1.add(data); -// } -// ProjectInfoMapper.addChinaCity(list1); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } - } - - @Override - public List> getProjectUnitList(String projectId) { - return ProjectInfoMapper.getProjectUnitList(projectId); - } - - /** - * 查询子公司部门ID - * - * @param deptId 部门ID - * @return 结果 - */ - private SysDept getZgsDept(Long deptId){ - SysDept sysDept = sysDeptMapper.selectDeptById(deptId); - if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ - //comFlag标识为1是子公司 - if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){ - return sysDept; - }else{ - return getZgsDept(sysDept.getParentId()); - } - }else{ - return sysDept; - } - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java deleted file mode 100644 index 35cc809a..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java +++ /dev/null @@ -1,582 +0,0 @@ -package com.ruoyi.web.pshManage.controller; - -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.QiniuUploadUtil; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.ServerConfig; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.web.pshManage.service.IPshService; -import com.ruoyi.web.sspMarks.domain.ProcessName; -import com.ruoyi.web.sspMarks.domain.SspMarks; -import com.ruoyi.web.sspMarks.service.ISspMarksService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpSession; -import java.util.*; - -/** - * @ClassName:SspController - * @Description:随手拍的控制层 - * @Author: - * @Date:2021/3/31 9:08 - * @version:V1.0 - */ -@Controller -@RequestMapping("/weixin/pshManage") -@CrossOrigin(origins = "*",maxAge = 3600) -public class PshController { - - @Autowired - private ServerConfig serverConfig; - - @Autowired - private IPshService pshService; - - @Autowired - private ISspMarksService sspMarksService; - - @Autowired - private ISysUserService sysUserService; - - private String prefix = "pshManage"; - - /**********************************************************页面跳转*************************************************/ - /** - * @describe:跳转到列表初始化页 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPage") - public String goListPage(@RequestParam Map map, HttpSession HttpSession, Model Model) { - HttpSession.setAttribute("loginName", map.get("loginName").toString()); - HttpSession.setAttribute("projectId", map.get("projectId").toString()); - HttpSession.setAttribute("projectName", map.get("projectName").toString()); - - Model.addAttribute("projectId", map.get("projectId").toString()); - Model.addAttribute("projectName", map.get("projectName").toString()); - return prefix + "/sspListPage"; - } - - /** - * @describe:跳转到列表页发布记录 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPageBack") - public String goListPageBack(@RequestParam Map map , HttpSession HttpSession , Model Model) { - Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():""); - Model.addAttribute("typeChangeText", map.containsKey("typeChangeText")?map.get("typeChangeText").toString():""); - Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():""); - Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName")); - return prefix + "/sspListPage"; - } - - /** - * @describe:跳转到列表页我发布 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPageMy") - public String goListPageMy(@RequestParam Map map , HttpSession HttpSession , Model Model) { - Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():""); - Model.addAttribute("typeChangeText", map.containsKey("typeChangeText")?map.get("typeChangeText").toString():""); - Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():""); - Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName")); - return prefix + "/sspListPageMy"; - } - - /** - * @describe:跳转到列表页我发布2 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPageMy2") - public String goListPageMy2(@RequestParam Map map , HttpSession HttpSession , Model Model) { - Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():""); - Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():""); - Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName")); - return prefix + "/sspListPageMy2"; - } - - /** - * 跳转至质量留痕上报页面 - * @param model - * @return - */ - @RequestMapping("/goNickedSave") - public String goNickedSave(String projectName, Model model, HttpSession session) { - //项目id - model.addAttribute("projectId",session.getAttribute("projectId")); - //项目名称 - model.addAttribute("projectName", projectName); - return prefix + "/reportWithmarks"; - } - - /** - * 跳转至质量留痕上报页面 - * @param model - * @return - */ - @RequestMapping("/goNickedSave2") - public String goNickedSave2(HttpSession session, Model model, String projectName, String projectId) { - String ZJUser = ""; - String ZJUserId = ""; - String ZJUserName = ""; - String ZJUserPhone = ""; - if(session.getAttribute("loginName") != null && !"".equals(session.getAttribute("loginName"))){ - String loginName = session.getAttribute("loginName").toString(); - Map user = pshService.queryUserInfo(loginName); - if(user != null && user.size() > 0){ - ZJUser = user.get("user_name").toString() + "-" + user.get("login_name").toString(); - ZJUserId = user.get("user_id").toString(); - ZJUserName = user.get("user_name").toString(); - ZJUserPhone = user.get("login_name").toString(); - } - } - model.addAttribute("ZJUser",ZJUser); - model.addAttribute("ZJUserId",ZJUserId); - model.addAttribute("ZJUserName",ZJUserName); - model.addAttribute("ZJUserPhone",ZJUserPhone); - model.addAttribute("projectId",projectId != null && !"".equals(projectId)?projectId:session.getAttribute("projectId")); - model.addAttribute("projectName", projectName); - return prefix + "/reportWithmarks2"; - } - - /** - * @describe:跳转到问题整改的页面 - * @author: - * @date:2021/4/1&10:41 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goChangeSave") - public String goChangeSave(String projectName, Model Model,HttpSession HttpSession) { - //项目名称 - Model.addAttribute("projectName", projectName); - SysUser sysUser = sysUserService.selectUserByUserName(Convert.toStr(HttpSession.getAttribute("loginName"))); - Model.addAttribute("recheckSend", sysUser.getNickName()); - Model.addAttribute("recheckSendUser", sysUser.getPhonenumber()); - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //当前时间基础上加3天默认为整改截至时间 - calendar.add(Calendar.DATE, 3); - Model.addAttribute("nickedTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,calendar.getTime())); - return prefix + "/sspChange"; - } - - /********************************************************数据页面跳转************************************************/ - /** - * @describe:跳转到待整改的页面 - * @author: - * @date:2021/4/1&11:04 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goStayCheckPageMy") - public Object goStayCheckPageMy(@RequestParam Map map, Model Model, HttpSession HttpSession) { - map.put("loginUser", HttpSession.getAttribute("loginName")); - Model.addAttribute("queryChangeNicked", pshService.queryChangeNicked(map)); - return prefix + "/myChanges"; - } - - /** - * @describe:跳转到待审核的页面 - * @author: - * @date:2021/4/1&11:04 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goStayCheckPage") - public Object goStayCheckPage(@RequestParam Map map, Model Model, HttpSession HttpSession) { - map.put("loginUser", HttpSession.getAttribute("loginName")); - Model.addAttribute("queryChangeNicked", pshService.queryChangeNicked(map)); - return prefix + "/sspStayCheck"; - } - - /** - * 质量留痕记录审批详情页面 - * @param map - * @param Model - * @param HttpSession - * @return - */ - @RequestMapping("/sspQualityMarkDetail") - public Object sspQualityMarkDetail(@RequestParam Map map, Model Model, HttpSession HttpSession) { - map.put("loginUser", HttpSession.getAttribute("loginName")); - Model.addAttribute("data", pshService.querySspQualityMarkInfo(map)); - return prefix + "/sspQualityMarkDetail"; - } - - /**********************************************************数据接口*************************************************/ - /** - * @describe:问题整改的列表接口 - * @author: - * @date:2021/3/31&9:10 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/listSspInfoChanges") - public Object listSspInfoChanges(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", HttpSession.getAttribute("projectId")); - map.put("loginName", HttpSession.getAttribute("loginName")); - return pshService.listSspInfoChanges(map); - } - - /** - * 获取质量留痕数据发布记录 - * @param map - * @param HttpSession - * @return - */ - @ResponseBody - @RequestMapping("/getSspQualityMark") - public Object getSspQualityMark(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - map.put("loginName", HttpSession.getAttribute("loginName")); - return pshService.querySspQualityMarkList(map); - } - - /** - * 获取当前用户提交的质量留痕数据发布记录 - * @param map - * @param HttpSession - * @return - */ - @ResponseBody - @RequestMapping(value = "/getSspQualityMarkMy",method = RequestMethod.POST) - public Object getSspQualityMarkMy(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - map.put("loginName", HttpSession.getAttribute("loginName")); - return pshService.querySspQualityMarkMyList(map); - } - - - /** - * @describe:查询随手拍信息的列表(问题整改，留痕上报) - * @author: - * @date:2021/3/31&9:12 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @PostMapping(value = "/listSspInfoMyNicked") - public Object listSspInfoMyNicked(@RequestParam Map map, HttpSession HttpSession, SspMarks sspMarks) { - map.put("projectId", HttpSession.getAttribute("projectId")); - map.put("createUser", HttpSession.getAttribute("loginName")); - return pshService.listSspInfoNicked(map); - } - - /** - * @describe:新增整改的信息 - * @author: - * @date:2021/4/1&17:19 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/saveChangeMy") - public Object saveChangeMy(@RequestParam Map map, HttpSession HttpSession) { - map.put("createUser", HttpSession.getAttribute("loginName")); - return pshService.saveSspInfoChanges(map); - } - - /** - * 新增留痕数据上报 - * - * @param sspMarks - * @param httpSession - * @return - */ - @ResponseBody - @RequestMapping(value = "/saveMarksMy", method = RequestMethod.POST) - public Object saveMarksMy(@RequestBody SspMarks sspMarks, HttpSession httpSession) { - sspMarks.setProjectId(Integer.parseInt(httpSession.getAttribute("projectId").toString())); - sspMarks.setCreateUser(httpSession.getAttribute("loginName").toString()); - return sspMarksService.saveMarksAndMore(sspMarks); - } - - /** - * 质量留痕数据提交 - * - * @param jsonObject - * @param httpSession - * @return - */ - @ResponseBody - @RequestMapping(value = "/saveQualityMark", method = RequestMethod.POST) - public Map saveQualityMark(@RequestBody JSONObject jsonObject, HttpSession httpSession) { - Map resultMap = new HashMap<>(); - jsonObject.put("create_user",httpSession.getAttribute("loginName")==null?"":httpSession.getAttribute("loginName").toString()); - if(sspMarksService.saveQualityMark(jsonObject) == 1){ - resultMap.put("code","200"); - resultMap.put("msg","提交成功"); - }else{ - resultMap.put("code","201"); - resultMap.put("msg","提交失败"); - } - return resultMap; - } - - - /** - * @describe:七牛文件上传token - * @author: - * @date:2021/4/6&14:29 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/getToken") - public String getToken() { return QiniuUploadUtil.getToken();}; - - /** - * @describe:查询用户列表 - * @author: - * @date:2021/4/6&18:02 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/queryUserInfo") - @ResponseBody - public Object queryUserInfo(@RequestParam Map map, HttpSession HttpSession) { - map.put("loginName", HttpSession.getAttribute("loginName")); - map.put("projectId", HttpSession.getAttribute("projectId")); - return pshService.queryUserInfo(map); - } - - /** - * 获取项目用户列表 - * @param map - * @return - */ - @RequestMapping("/queryUserList") - @ResponseBody - public Object queryUserList(@RequestBody Map map){ - return pshService.queryUserList(map); - } - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/updateChange") - public Object updateChange(@RequestParam Map map, HttpSession HttpSession) { - map.put("createUser", HttpSession.getAttribute("loginName")); - return pshService.updateState(map); - } - - /** - * 查询留痕上报页面 - * - * @param sspMarks - * @return - */ - @ResponseBody - @RequestMapping("/listMarks") - public Object listMarks(SspMarks sspMarks, HttpSession session) { - sspMarks.setProjectId(Integer.parseInt(session.getAttribute("projectId").toString())); - return sspMarksService.queryMarksList(sspMarks); - } - - - /** - * 回显质量留痕页面 - * - * @param map - * @param model - * @return - */ - @RequestMapping("/goMarksView") - public Object goMarksView(@RequestParam Map map, Model model) { - Map pictureMap = new HashMap<>(); - Map videoMap = new HashMap<>(); - SspMarks sspMarks = new SspMarks(); - sspMarks.setId(map.get("id").toString()); - sspMarks.setCheckState(map.get("numState").toString()); - SspMarks dbSSpMark = sspMarksService.selectSspMarksList(sspMarks).get(0); - String marksPicture = dbSSpMark.getMarksPicture(); - if(StringUtils.isNotBlank(marksPicture)) { - List fileListPicture = sspMarksService.queryPicture(dbSSpMark); - if(fileListPicture != null && fileListPicture.size() > 0) { - pictureMap.put("fileListPictureState", "OK"); - pictureMap.put("fileListPicture", fileListPicture); - } else { - pictureMap.put("fileListPictureState", "NO"); - } - } - if(StringUtils.isNotBlank(dbSSpMark.getMarksVideo())) { - List fileListVideo = sspMarksService.queryVideo(dbSSpMark); - if(fileListVideo != null && fileListVideo.size() > 0) { - videoMap.put("fileListVideoState", "OK"); - videoMap.put("fileListVideo", fileListVideo); - } else { - videoMap.put("fileListVideoState", "NO"); - } - } - model.addAttribute("dbSSpMark",dbSSpMark); - model.addAttribute("pictureMap",pictureMap); - model.addAttribute("videoMap",videoMap); - return prefix + "/sspMarkView"; - } - - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/sspQualityMarkApprove") - public Object sspQualityMarkApprove(@RequestParam Map map, HttpSession HttpSession) { - map.put("loginName", HttpSession.getAttribute("loginName")); - return pshService.updateSspQualityMarkApprove(map); - } - - /** - *获取工程类型 - * @param param - * @return - */ - @RequestMapping("/getProjectType") - @ResponseBody - public Object selectProjectTypeList(@RequestParam Map param){ - return pshService.selectProjectTypeList(param); - } - - @RequestMapping("/treesList") - @ResponseBody - public Map getFatherNode(ProcessName processName) { - Map resultMap = new HashMap<>(); - // 查询所有部门信息 - List treesList = pshService.selectProcessName("0"); - List newTrees = new ArrayList(); - for (ProcessName department : treesList) { - // 如果pId为0，则该节点为父节点 - if ((department.getParentCode().equals("0"))) { - // 递归获取父节点下的子节点 - department.setList(getChildrenNode(department.getId(), treesList)); - newTrees.add(department); - } - } - resultMap.put("children", newTrees); - System.out.println(resultMap); - return resultMap; - } - - /** - * 递归获取子节点下的子节点 - * @param integer 父节点的ID - * @param treesList 所有菜单树集合 - * @return - */ - private List getChildrenNode(String integer, List treesList) { - List newTrees = new ArrayList(); - for (ProcessName department : treesList) { - if ((department.getParentCode().equals("0"))) { - continue; - } - if (department.getParentCode().equals(integer)) { - // 递归获取子节点下的子节点，即设置树控件中的children - department.setList(getChildrenNode(department.getId(), treesList)); - newTrees.add(department); - } - } - return newTrees; - } - - /** - * 查询工程编码、名称 - * @return - */ - @RequestMapping("selectCodeFromSmark") - @ResponseBody - public Object selectCodeFromSmark(String projectId) { - return pshService.querySmarkCode(projectId); - } - - /** - * 通用上传请求（单个） - */ - @PostMapping("/upload") - @ResponseBody - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + fileName; - AjaxResult ajax = AjaxResult.success(); - ajax.put("url", url); - ajax.put("fileName", fileName); - ajax.put("newFileName", FileUtils.getName(fileName)); - ajax.put("originalFilename", file.getOriginalFilename()); - return ajax; - } - catch (Exception e) - { - return AjaxResult.error(e.getMessage()); - } - } - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java deleted file mode 100644 index 56a10f61..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java +++ /dev/null @@ -1,370 +0,0 @@ -package com.ruoyi.web.pshManage.mapper; - -import com.ruoyi.web.sspMarks.domain.ProcessName; -import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo; -import com.ruoyi.web.sspMarks.domain.SspMarksflow; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName:sspMapper - * @Description:随手拍的数据层 - * @Author: - * @Date:2021/3/30 15:23 - * @version:V1.0 - */ -@Repository -public interface PshMapper { - - /** - * @describe:查询随手拍信息的列表(问题整改) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listSspInfoChanges(Map map); - - - /** - * @describe:查询随手拍信息的列表(问题整改，留痕上报) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listSspInfoMyNicked(Map map); - - /** - * @describe:根据id查询相关基本信息 - * @author: - * @date:2021/4/1&11:15 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryChangeNickedInfo(Map map); - - /** - * @describe:根据id查询相关的文件 - * @author: - * @date:2021/4/1&11:19 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listChangeNickedFile(Map map); - - /** - * @describe:新增问题整改主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspInfoChanges(Map map); - - /** - * @describe:新增留痕上报主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspInfoNicked(Map map); - - /** - * @describe:修改留痕上报主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int updateSmzSspProblemmodify(Map map); - - /** - * @describe:新增流程信息 - * @author: - * @date:2021/3/31&9:27 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspAuditInfo(Map map); - - /** - * @describe:新增文件信息 - * @author: - * @date:2021/3/31&9:36 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspFileInfo(Map map); - - /** - * @describe:修改状态 - * @author: - * @date:2021/4/2&11:28 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int updateState(Map map); - - /** - * @describe:修改状态 - * @author: - * @date:2021/4/2&11:28 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int updateStateOk(Map map); - - /** - * @describe:查询已整改的基本信息 - * @author: - * @date:2021/4/6&9:57 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryOpinion(Map map); - - /** - * @describe:查询已整改的基本信息 - * @author: - * @date:2021/4/6&9:57 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryOpinionChange(Map map); - - /** - * @describe:查询已整改的文件信息 - * @author: - * @date:2021/4/6&9:59 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listOpinionFile(Map map); - - /** - * @describe:查询人员的信息 - * @author: - * @date:2021/4/6&17:18 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listUserInfo(Map map); - - /** - * 根据用户账号查询用户信息 - * @param loginName - * @return - */ - public Map queryUserInfo(String loginName); - - /** - * 获取项目用户列表 - * @param map - * @return - */ - public List> queryUserList(Map map); - - /** - * @describe:查询负责人的项目归属 - * @author: - * @date:2021/4/6&17:24 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryUserProjectInfo(Map map); - - /** - * @describe:添加驳回的审核意见 - * @author: - * @date:2021/4/7&15:35 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspAuditInfoReject(Map map); - - /** - * @describe:添加通过的审核意见 - * @author: - * @date:2021/4/7&15:35 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspAuditInfoPass(Map map); - - /** - * @describe:查询当前审核流程的信息 - * @author: - * @date:2021/4/7&16:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryAuditInfo(Map map); - - /** - * @describe:查询驳回信息 - * @author: - * @date:2021/4/7&16:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public String queryRejectInfo(Map map); - - - /** - * @describe:查询N次提交的图片信息 - * @author: - * @date:2021/4/7&17:18 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listRejectFile(Map map); - - - /** - * 新增留痕上报流程 - * - * @param sspMarksflow - * @return - */ - int saveSspMarkFlow(SspMarksflow sspMarksflow); - - /** - * 新增留痕审批文件 - * - * @param sspMarkfileinfo - * @return - */ - int saveMarkFileInfo(SspMarkfileinfo sspMarkfileinfo); - - - /** - * 根据type获取url - * - * @return - */ - Map queryFileInfo(Map map); - - /** - * 获取质量留痕数据发布记录 - * @param map - * @return - */ - List> querySspQualityMarkList(Map map); - - /** - * 获取当前用户提交的质量留痕数据发布记录 - * @param map - * @return - */ - List> querySspQualityMarkMyList(Map map); - - /** - * 获取质量留痕记录详情 - * @param map - * @return - */ - Map querySspQualityMarkInfo(Map map); - - /** - * 获取质量留痕审批流下一个待审批账号 - * @param map - * @return - */ - String querySspQualityMarkApproveNextLoginName(Map map); - - /** - * 获取质量留痕审批流待审批数量 - */ - int querySspQualityMarkToBeApprovedNum(Map map); - - /** - * 更新隐蔽工程留痕记录审批流审批状态 - * @param map - * @return - */ - int updateSspQualityMarkApproveState(Map map); - - /** - * 更新隐蔽工程留痕记录审批状态 - * @param map - * @return - */ - int updateSspQualityMarkState(Map map); - - /** - * 查询工程类型列表 - * - * @param projectType 工程类型信息 - * @return 工程类型集合 - */ - public List> selectProjectTypeList(Map projectType); - - /** - * 查询关键工序名称列表 - * - * @param isDel - * @return - */ - List selectProcessName(String isDel); - - /** - * 根据入工区编码, 查询工程编码 - * - * @param proId - * @return - */ - List> selectCodeFromSmark(String proId); - - /** - * 查询项目用户信息 - * @param map - * @return - */ - List> queryProjectUserinfo(Map map); -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java deleted file mode 100644 index f0423630..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.ruoyi.web.pshManage.service; - -import com.ruoyi.web.sspMarks.domain.ProcessName; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName:SspService - * @Description:随手拍服务层 - * @Author: - * @Date:2021/3/30 17:03 - * @version:V1.0 - */ -public interface IPshService { - - /** - * @describe:查询随手拍信息的列表(问题整改) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map listSspInfoChanges(Map map); - - - /** - * @describe:查询随手拍信息的列表(留痕上报) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Object listSspInfoNicked(Map map); - - /** - * @describe:查询审批流的信息 - * @author: - * @date:2021/4/1&11:49 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryChangeNicked(Map map); - - /** - * @describe:新增问题整改主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public String saveSspInfoChanges(Map map); - - /** - * @describe:查询人员的信息 - * @author: - * @date:2021/4/6&17:26 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> queryUserInfo(Map map); - - /** - * 根据用户账号查询用户信息 - * @param loginName - * @return - */ - public Map queryUserInfo(String loginName); - - /** - * 获取项目用户列表 - * @param map - * @return - */ - public List> queryUserList(Map map); - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Object updateState(Map map); - - /** - * 获取质量留痕数据发布记录 - * @return - */ - public Map querySspQualityMarkList(Map map); - - /** - * 获取当前用户提交的质量留痕数据发布记录 - * @param map - * @return - */ - public Map querySspQualityMarkMyList(Map map); - - /** - * 获取质量留痕记录详情 - * @param map - * @return - */ - public Map querySspQualityMarkInfo(Map map); - - /** - * 隐蔽工程留痕记录审批 - * @param map - * @return - */ - public Map updateSspQualityMarkApprove(Map map); - - /** - * 查询工程类型列表 - * - * @param projectType 工程类型信息 - * @return 工程类型集合 - */ - public List> selectProjectTypeList(Map projectType); - - /** - * 查询关键工序名称列表 - * - * @param isDel - * @return - */ - List selectProcessName(String isDel); - - /** - * 根据入参查询智能公司工区名称、工区编号 - * - * @param proId - * @return - */ - Map querySmarkCode(String proId); -} \ No newline at end of file diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/PshServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/PshServiceImpl.java deleted file mode 100644 index 9fcd589e..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/PshServiceImpl.java +++ /dev/null @@ -1,565 +0,0 @@ -package com.ruoyi.web.pshManage.service; - -import com.alibaba.fastjson.JSONArray; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DeptTypeEnum; -import com.ruoyi.common.enums.PublicStateEnum; -import com.ruoyi.common.enums.SysRoleEnum; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.QiniuBase64UploadUtil; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.web.projectInfo.mapper.WxProjectInfoMapper; -import com.ruoyi.web.pshManage.mapper.PshMapper; -import com.ruoyi.web.sspMarks.domain.ProcessName; -import com.ruoyi.web.userLogin.mapper.WxUserLoginMapper; -import com.ruoyi.web.utils.MultipartFileUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import java.util.*; - -/** - * @ClassName:ISspServiceImpl - * @Description:TODO - * @Author: - * @Date:2021/3/30 17:04 - * @version:V1.0 - */ -@Service -public class PshServiceImpl implements IPshService { - - @Autowired - private PshMapper pshMapper; - - @Autowired - private WxUserLoginMapper wxUserLoginMapper; - - @Autowired - private SysRoleMapper sysRoleMapper; - - @Autowired - private WxProjectInfoMapper wxProjectInfoMapper; - - - /** - * @describe:查询随手拍信息的列表(问题整改) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - @Transactional - public Map listSspInfoChanges(Map map) { - //返回 - Map resultMap = new HashMap<>(16); - /** - * 根据获取的用户信息和项目id进行判断是抄送还是主送 - * showState - * 主送状态0 - * 抄送状态1 - * */ - - String thisUser = map.get("loginName").toString(); - String projectName = ""; - //查询问题整改数据(发布记录) - List> allChangesInfo = pshMapper.listSspInfoChanges(map); - if(allChangesInfo != null && allChangesInfo.size() > 0) { - //循环数据，判断加主送抄送状态 - for (int i = 0; i < allChangesInfo.size(); i++) { - Map infoMap = allChangesInfo.get(i); - //主送人 - String lordSendUser = infoMap.get("lordSentUser").toString(); - if(thisUser.equals(lordSendUser)) { - //待办的 - infoMap.put("showState","0"); - } else { - //抄送的 - infoMap.put("showState","1"); - } - projectName = infoMap.get("projectName").toString(); - } - } - //查询问题整改数据(我的发布) - //(0问题整改, 1质量留痕) - - /** - * 如果没有选择默认是问题整改 - */ - if(StringUtils.isBlank(map.get("infoType").toString())) { - map.put("infoType", "0"); - } - List> allNickedInfo = pshMapper.listSspInfoMyNicked(map); - if(allNickedInfo != null && allNickedInfo.size() > 0) { - //循环数据，判断加主送抄送状态 - for (int i = 0; i < allNickedInfo.size(); i++) { - Map infoMap = allNickedInfo.get(i); - String lordSendUser = infoMap.get("lordSentUser").toString(); - if(thisUser.equals(lordSendUser)) { - //待办理 - infoMap.put("showState","0"); - } else { - //抄送的 - infoMap.put("showState","1"); - } - } - } - //工程名称 - resultMap.put("projectName", projectName); - //发布记录 - resultMap.put("allChangesInfo", allChangesInfo); - //我的发布 - resultMap.put("allNickedInfo", allNickedInfo); - //发布记录数量 - resultMap.put("allChangesInfoSize", allChangesInfo != null?allChangesInfo.size():0); - //我的发布数量 - resultMap.put("allNickedInfoSize", allNickedInfo != null?allNickedInfo.size():0); - return resultMap; - } - - /** - * @describe:查询随手拍信息的列表(留痕上报[问题整改我发起的]) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public Object listSspInfoNicked(Map map) { - String result = "NO"; - //根据infoTy判断是问题整改或者是留痕上报 - //String infoType = map.get("infoType").toString(); - if(true) { - Map updateMap = new HashMap<>(); - Map dataMap = new HashMap<>(); - dataMap.put("loginName",map.get("createUser")); - //问题整改 - Map deptMap = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("createUser"))); - //当前角色时管理员时，修改角色为集团公司 - String roleType = ""; - if(DeptTypeEnum.JTGS.getCode().equals(deptMap.get("type_flag"))){ - List> datalist = pshMapper.queryProjectUserinfo(map); - if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).get("job_type"))){ - //说明是甲方经理 - roleType = DeptTypeEnum.JFDBTYPE.getCode(); - }else{ - roleType = DeptTypeEnum.JTGSTYPE.getCode(); - } - }else if(DeptTypeEnum.ZGS.getCode().equals(deptMap.get("type_flag"))){ - List> datalist = pshMapper.queryProjectUserinfo(map); - if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).get("job_type"))){ - //说明是甲方经理 - roleType = DeptTypeEnum.JFDBTYPE.getCode(); - }else{ - roleType = DeptTypeEnum.ZGSTYPE.getCode(); - } - }else if(DeptTypeEnum.JLDW.getCode().equals(deptMap.get("type_flag"))){ - roleType = DeptTypeEnum.JLDWTYPE.getCode(); - }else if(DeptTypeEnum.ZBDW.getCode().equals(deptMap.get("type_flag"))){ - roleType = DeptTypeEnum.ZBDWTYPE.getCode(); - }else if(DeptTypeEnum.FBDW.getCode().equals(deptMap.get("type_flag"))){ - roleType = DeptTypeEnum.FBDWTYPE.getCode(); - } - map.put("roleType",roleType); - /** - * 基本信息入库 - * 图片 视频入库 - * 添加对应的审批流 - * */ - //基本信息 - map.put("nickedTime", DateUtils.parseDate(map.get("nickedTime"))); - int a = pshMapper.saveSspInfoChanges(map); - //审批流创建 - map.put("mainId", map.get("id")); - map.put("processState", "1"); - updateMap.put("id",map.get("id")); - int b = pshMapper.saveSspAuditInfo(map); - //图片 - int c = 0; - JSONArray JSONArray = com.alibaba.fastjson.JSONArray.parseArray(map.get("imgSrc").toString()); - String smarkUrl=""; - for (int i = 0; i < JSONArray.size(); i++) { - //String name = "sspImg-"+ UUID.randomUUID()+".jpg"; - String objImg64 = JSONArray.get(i).toString(); - String imgBase64One = objImg64.substring(0, objImg64.indexOf(",")); - //String imgBase64 = objImg64.substring(imgBase64One.length()+1, objImg64.length()); - Map imgMap = new HashMap<>(); - try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - //imgMap.put("fileUrl",fileName); - //imgMap = new QiniuBase64UploadUtil().put64image(imgBase64, name); - smarkUrl+=","+fileName; - imgMap.put("fileUrl", fileName); - } catch (Exception e) { - e.printStackTrace(); - } - imgMap.put("auditId", map.get("auditId")); - imgMap.put("fileType", "0"); - //imgMap.put("fileUrl", imgMap.get("url")); - imgMap.put("createUser", map.get("createUser")); - c = pshMapper.saveSspFileInfo(imgMap); - } - //视频 - if(!"".equals(map.get("videoUrl").toString())) { - Map fileArgsMap = new HashMap<>(16); - fileArgsMap.put("auditId", map.get("auditId")); - fileArgsMap.put("createUser", map.get("createUser")); - fileArgsMap.put("fileType", "1"); - fileArgsMap.put("fileUrl", map.get("videoUrl")); - updateMap.put("marksVideo",map.get("videoUrl")); - pshMapper.saveSspFileInfo(fileArgsMap); - } - smarkUrl = smarkUrl.substring(1); - updateMap.put("marksPicture",smarkUrl.split(",")[0]); - updateMap.put("smarkUrl",smarkUrl); - pshMapper.updateSmzSspProblemmodify(updateMap); - if(a > 0 && b > 0 && c > 0) { - result = "OK"; - } - } - return result; - } - - @Override - public Map queryChangeNicked(Map map) { - //基本信息 - Map ChangeNickedInfo = pshMapper.queryChangeNickedInfo(map); - //获取流程的id,请求相关的文件信息 - map.put("auditId",ChangeNickedInfo.get("checkId")); - map.put("fileType","0"); - //图片 - List> fileListImg = pshMapper.listChangeNickedFile(map); - if(fileListImg != null && fileListImg.size() > 0) { - ChangeNickedInfo.put("fileListImgState", "OK"); - ChangeNickedInfo.put("fileListImg", fileListImg); - } else { - ChangeNickedInfo.put("fileListImgState", "NO"); - ChangeNickedInfo.put("fileListImg", new ArrayList<>()); - } - //视频 - //map.put("fileType","1"); - //List> fileListVideo = pshMapper.listChangeNickedFile(map); - //if(fileListVideo != null && fileListVideo.size() > 0) { - // ChangeNickedInfo.put("fileListVideoState", "OK"); - // ChangeNickedInfo.put("fileListVideo", fileListVideo); - //} else { - ChangeNickedInfo.put("fileListVideoState", "NO"); - //} - //审核流程的信息 查询状态为0的信息 基本信息和文件信息 当前审批流是否存在驳回 - Map opinionMap; - if("2".equals(map.get("numState").toString()) || "3".equals(map.get("numState").toString())) { - opinionMap = pshMapper.queryOpinionChange(map); - } else { - opinionMap = pshMapper.queryOpinion(map); - } - ChangeNickedInfo.put("opinion", opinionMap.get("opinion")==null?"":opinionMap.get("opinion")); - ChangeNickedInfo.put("opinionCreateTime", opinionMap.get("opinionCreateTime")); - - /*****************************************************驳回判断**************************************************/ - //当前审核信息状态 - Map auditInfoMap = pshMapper.queryAuditInfo(map); - //是否有驳回 - String rejectInfo = pshMapper.queryRejectInfo(map); - if(("0".equals(auditInfoMap.get("processState")) || !auditInfoMap.containsKey("processState")) && rejectInfo == null) { - //初始审核状态 - List> opinionFileUrl = pshMapper.listOpinionFile(map); - if(opinionFileUrl != null && opinionFileUrl.size() > 0) { - ChangeNickedInfo.put("opinionFileUrlState", "OK"); - ChangeNickedInfo.put("opinionFileUrl", opinionFileUrl); - ChangeNickedInfo.put("rejectState", "NO"); - } else { - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - ChangeNickedInfo.put("rejectState", "NO"); - } - } else if("0".equals(auditInfoMap.get("processState")) && rejectInfo != null) { - //被驳回的状态 以N次提交 - map.put("id", auditInfoMap.get("id")); - List> opinionFileUrl = pshMapper.listRejectFile(map); - if(opinionFileUrl != null && opinionFileUrl.size() > 0) { - ChangeNickedInfo.put("opinionFileUrlState", "OK"); - ChangeNickedInfo.put("opinionFileUrl", opinionFileUrl); - ChangeNickedInfo.put("rejectState", "OK"); - ChangeNickedInfo.put("rejectInfo", rejectInfo); - } else { - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - ChangeNickedInfo.put("rejectState", "OK"); - ChangeNickedInfo.put("rejectInfo", rejectInfo); - } - } else if("2".equals(auditInfoMap.get("processState")) && rejectInfo != null) { - //被驳回且没有再次上传 - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - ChangeNickedInfo.put("rejectState", "OK"); - ChangeNickedInfo.put("rejectInfo", rejectInfo); - }else{ - ChangeNickedInfo.put("rejectState", "NO"); - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - } - - /**************************************************************************************************************/ - if(map.get("loginUser").equals(ChangeNickedInfo.get("recheckSendUser"))) { - ChangeNickedInfo.put("checkUserState", "OK"); - } else { - ChangeNickedInfo.put("checkUserState", "NO"); - } - ChangeNickedInfo.put("numState", map.get("numState")); - return ChangeNickedInfo; - } - - /** - * @describe:新增问题整改主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public String saveSspInfoChanges(Map map) { - //修改信息表的状态 - map.put("tableName", "smz_ssp_problemmodify"); - map.put("fieldName", "checkState"); - map.put("checkState", "1"); - map.put("keySet", "id"); - int a = pshMapper.updateState(map); - //审批信息入库 - map.put("mainId", map.get("id")); - map.put("opinion", map.get("opinion")); - map.put("processState", "0"); - int b = pshMapper.saveSspAuditInfo(map); - int c = 0; - //图片入库 - JSONArray JSONArray = com.alibaba.fastjson.JSONArray.parseArray(map.get("imgSrc").toString()); - for (int i = 0; i < JSONArray.size(); i++) { - //String name = "sspImg-"+ UUID.randomUUID()+".jpg"; - String objImg64 = JSONArray.get(i).toString(); - String imgBase64One = objImg64.substring(0, objImg64.indexOf(",")); - //String imgBase64 = objImg64.substring(imgBase64One.length()+1, objImg64.length()); - Map imgMap = new HashMap<>(); - try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - //imgMap = new QiniuBase64UploadUtil().put64image(imgBase64, name); - imgMap.put("fileUrl", fileName); - } catch (Exception e) { - e.printStackTrace(); - } - imgMap.put("auditId", map.get("auditId")); - imgMap.put("fileType", "0"); - //imgMap.put("fileUrl", imgMap.get("url")); - imgMap.put("createUser", map.get("createUser")); - c = pshMapper.saveSspFileInfo(imgMap); - } - if(a > 0 && b > 0 && c > 0) { - return "OK"; - } - return "NO"; - } - - /** - * @describe:查询人员的信息 - * @author: - * @date:2021/4/6&17:26 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public List> queryUserInfo(Map map) { - List> resultList = new ArrayList<>(); - //查询所属项目 - Map userMap = pshMapper.queryUserProjectInfo(map); - //查询相关人员 - List> userInfoList = pshMapper.listUserInfo(map); - if(userInfoList != null && userInfoList.size() > 0) { - userMap.put("people", userInfoList); - } - resultList.add(userMap); - return resultList; - } - - @Override - public Map queryUserInfo(String loginName) { - return pshMapper.queryUserInfo(loginName); - } - - @Override - public List> queryUserList(Map map) { - List> resultList = new ArrayList<>(); - Map user = new HashMap<>(); - List> userList = pshMapper.queryUserList(map); - if(userList != null && userList.size() > 0){ - user.put("people",userList); - } - resultList.add(user); - return resultList; - } - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public Object updateState(Map map) { - /** - * 根据状态修改 - * 4通过 - * 3为驳回 - * */ - int code = 0; - int codeA = 0; - if("4".equals(map.get("checkState").toString())) { - //通过 修改主表状态 为通过 - map.put("tableName", "smz_ssp_problemmodify"); - map.put("fieldName", "checkState"); - map.put("checkState", map.get("checkState")); - map.put("keySet", "id"); - code = pshMapper.updateStateOk(map); - //添加通过意见 - Map rejectMap = new HashMap<>(16); - rejectMap.put("mainId", map.get("id")); - rejectMap.put("opinion", map.get("opinion")); - rejectMap.put("createUser", map.get("createUser")); - codeA = pshMapper.saveSspAuditInfoPass(rejectMap); - } else { - //驳回 修改主表状态 待整改 添加审核流程驳回意见 - map.put("tableName", "smz_ssp_problemmodify"); - map.put("fieldName", "checkState"); - map.put("checkState", "0"); - map.put("keySet", "id"); - code = pshMapper.updateState(map); - //添加驳回意见 - Map rejectMap = new HashMap<>(16); - rejectMap.put("mainId", map.get("id")); - rejectMap.put("opinion", map.get("opinion")); - rejectMap.put("createUser", map.get("createUser")); - codeA = pshMapper.saveSspAuditInfoReject(rejectMap); - } - return code + codeA; - } - - @Override - public Map querySspQualityMarkList(Map map) { - Map resultMap = new HashMap<>(); - List> list = pshMapper.querySspQualityMarkList(map); - List> list_my = pshMapper.querySspQualityMarkMyList(map); - resultMap.put("list",list); - resultMap.put("list_num",list != null?list.size():0); - resultMap.put("list_my_num",list_my != null?list_my.size():0); - return resultMap; - } - - @Override - public Map querySspQualityMarkMyList(Map map) { - Map resultMap = new HashMap<>(); - List> list = pshMapper.querySspQualityMarkList(map); - List> list_my = pshMapper.querySspQualityMarkMyList(map); - resultMap.put("list",list_my); - resultMap.put("list_num",list != null?list.size():0); - resultMap.put("list_my_num",list_my != null?list_my.size():0); - return resultMap; - } - - @Override - public Map querySspQualityMarkInfo(Map map) { - Map data = pshMapper.querySspQualityMarkInfo(map); - String[] arr; - if(data.containsKey("before_imgs") && !"".equals(data.get("before_imgs"))){ - arr = data.get("before_imgs").toString().split(","); - data.put("before_imgs",arr); - } - if(data.containsKey("after_imgs") && !"".equals(data.get("after_imgs"))){ - arr = data.get("after_imgs").toString().split(","); - data.put("after_imgs",arr); - } - int approve_state = 0;//(0:不可审批;1:可审批) - if(Integer.parseInt(data.get("state").toString()) == 0){//待审批 - String next_approve_login_name = pshMapper.querySspQualityMarkApproveNextLoginName(map); - String loginUser = map.containsKey("loginUser")?map.get("loginUser").toString():""; - if(next_approve_login_name != null && next_approve_login_name.equals(loginUser)){ - approve_state = 1; - } - } - data.put("approve_state",approve_state); - return data; - } - - @Override - public Map updateSspQualityMarkApprove(Map map) { - Map resultMap = new HashMap<>(); - if("2".equals(map.get("state").toString())){//驳回 - if(pshMapper.updateSspQualityMarkApproveState(map) == 1){ - if(pshMapper.updateSspQualityMarkState(map) == 1){ - resultMap.put("code","200"); - resultMap.put("msg","审批成功！"); - } - } - }else if("1".equals(map.get("state").toString())){//通过 - if(pshMapper.updateSspQualityMarkApproveState(map) == 1){ - if(pshMapper.querySspQualityMarkToBeApprovedNum(map) == 0){ - if(pshMapper.updateSspQualityMarkState(map) == 1){ - resultMap.put("code","200"); - resultMap.put("msg","审批成功！"); - }else{ - resultMap.put("code","201"); - resultMap.put("msg","审批失败！"); - } - }else{ - resultMap.put("code","200"); - resultMap.put("msg","审批成功！"); - } - }else { - resultMap.put("code","201"); - resultMap.put("msg","审批失败！"); - } - } - return resultMap; - } - - @Override - public List> selectProjectTypeList(Map projectType) { - return pshMapper.selectProjectTypeList(projectType); - } - - @Override - public List selectProcessName(String isDel) { - return pshMapper.selectProcessName(isDel); - } - - @Override - public Map querySmarkCode(String proId) { - Map returnMap = new HashMap<>(); - List> ponitCode = pshMapper.selectCodeFromSmark(proId); - if(ponitCode.size() > 0 || ponitCode != null) { - returnMap.put("code", "200"); - returnMap.put("msg", "查询成功"); - returnMap.put("ponitCode", ponitCode); - } else { - returnMap.put("code", "100"); - returnMap.put("msg", "请检查参数"); - } - return returnMap; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/mapper/PshMarksMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/mapper/PshMarksMapper.java deleted file mode 100644 index 55908b5b..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/mapper/PshMarksMapper.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.ruoyi.web.pshMarks.mapper; - -import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo; -import com.ruoyi.web.sspMarks.domain.SspMarks; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * 随手拍留痕上报 数据层 - * - * @author gwb - * @date 2021-04-06 - */ -@Repository -public interface PshMarksMapper -{ - /** - * 查询随手拍留痕上报信息 - * - * @param id 随手拍留痕上报ID - * @return 随手拍留痕上报信息 - */ - public SspMarks selectSspMarksById(Integer id); - - /** - * 查询随手拍留痕上报列表 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 随手拍留痕上报集合 - */ - public List selectSspMarksList(SspMarks sspMarks); - - /** - * 新增随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int insertSspMarks(SspMarks sspMarks); - - /** - * 修改随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int updateSspMarks(SspMarks sspMarks); - - /** - * 删除随手拍留痕上报 - * - * @param id 随手拍留痕上报ID - * @return 结果 - */ - public int deleteSspMarksById(Integer id); - - /** - * 批量删除随手拍留痕上报 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSspMarksByIds(String[] ids); - - - int addSspMarks(SspMarks sspMarks); - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryPicture(SspMarks sspMarks); - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryVideo(SspMarks sspMarks); - - - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryPictureUrl(SspMarkfileinfo sspMarkfileinfo); - - /** - * 根据id和文件类型查询 视频 - * - * @return - */ - List queryVideoUrl(SspMarkfileinfo sspMarkfileinfo); - - /** - * 更新图片 - * - * @param map - * @return - */ - public int updatePicture(Map map); - - /** - * 更新视频 - * - * @param map - * @return - */ - public int updateVideo(Map map); - - /** - * 更新智能公司数据 - * - * @param map - * @return - */ - public int updateSmarkUrl(Map map); - - /** - * 根据审核状态查询 - * - * @param map - * @return - */ - List queryByCheckState(Map map); - - /** - * 根据id查询留痕信息 - * - * @param id - * @return - */ - SspMarks queryById(String id); - - /** - * 新增质量留痕提交记录 - * @param map - * @return - */ - int insertSspQualityMark(Map map); - - /** - * 新增质量留痕审批流 - * @param map - * @return - */ - int insertSspQualityMarkApprove(Map map); -} \ No newline at end of file diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/IPshMarksService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/IPshMarksService.java deleted file mode 100644 index af2507c8..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/IPshMarksService.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.ruoyi.web.pshMarks.service; - -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.web.sspMarks.domain.SspMarks; - -import java.util.List; -import java.util.Map; - -/** - * 随手拍留痕上报 服务层 - * - * @author mkl - * @date 2021-04-06 - */ -public interface IPshMarksService -{ - /** - * 查询随手拍留痕上报信息 - * - * @param id 随手拍留痕上报ID - * @return 随手拍留痕上报信息 - */ - public SspMarks selectSspMarksById(Integer id); - - /** - * 查询随手拍留痕上报列表 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 随手拍留痕上报集合 - */ - public List selectSspMarksList(SspMarks sspMarks); - - /** - * 新增随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int insertSspMarks(SspMarks sspMarks); - - /** - * 修改随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int updateSspMarks(SspMarks sspMarks); - - /** - * 保存随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int saveSspMarks(SspMarks sspMarks); - - - /** - * 删除随手拍留痕上报信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSspMarksByIds(String ids); - - - /** - * 新增留痕数据上报 - * - * @param sspMarks - * @return - */ - Object saveMarksAndMore(SspMarks sspMarks); - - /** - * 提交质量留痕记录 - * @param jsonObject - * @return - */ - int saveQualityMark(JSONObject jsonObject); - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryPicture(SspMarks sspMarks); - - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryVideo(SspMarks sspMarks); - - - /** - * 查询留痕数据列表 - * - * @param sspMarks - * @return - */ - Map queryMarksList(SspMarks sspMarks); - - - - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/PshMarksServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/PshMarksServiceImpl.java deleted file mode 100644 index d72f977b..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/PshMarksServiceImpl.java +++ /dev/null @@ -1,403 +0,0 @@ -package com.ruoyi.web.pshMarks.service; - -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.web.pshMarks.mapper.PshMarksMapper; -import com.ruoyi.web.sspManage.mapper.SspMapper; -import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo; -import com.ruoyi.web.sspMarks.domain.SspMarks; -import com.ruoyi.web.sspMarks.domain.SspMarksflow; -import com.ruoyi.web.utils.MultipartFileUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.*; - - -/** - * 随手拍留痕上报 服务层实现 - * - * @author gwb - * @date 2021-04-06 - */ -@Service -public class PshMarksServiceImpl implements IPshMarksService -{ - @Autowired - private PshMarksMapper pshMarksMapper; - - @Autowired - private SspMapper sspMapper; - - - /** - * 查询随手拍留痕上报信息 - * - * @param id 随手拍留痕上报ID - * @return 随手拍留痕上报信息 - */ - @Override - public SspMarks selectSspMarksById(Integer id) - { - return pshMarksMapper.selectSspMarksById(id); - } - - /** - * 查询随手拍留痕上报列表 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 随手拍留痕上报集合 - */ - @Override - public List selectSspMarksList(SspMarks sspMarks) - { - return pshMarksMapper.selectSspMarksList(sspMarks); - } - - /** - * 新增随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - @Override - public int insertSspMarks(SspMarks sspMarks) - { - return pshMarksMapper.insertSspMarks(sspMarks); - } - - /** - * 修改随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - @Override - public int updateSspMarks(SspMarks sspMarks) - { - return pshMarksMapper.updateSspMarks(sspMarks); - } - - /** - * 保存随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - @Override - public int saveSspMarks(SspMarks sspMarks) - { - String id = sspMarks.getId(); - int rows = 0; - if (StringUtils.isNotNull(id)) - { - rows = pshMarksMapper.updateSspMarks(sspMarks); - } - else - { - rows = pshMarksMapper.insertSspMarks(sspMarks); - } - return rows; - } - - /** - * 删除随手拍留痕上报对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSspMarksByIds(String ids) - { - return pshMarksMapper.deleteSspMarksByIds(Convert.toStrArray(ids)); - } - - /** - * 新增留痕数据上报 - * - * @param sspMarks - * @return - */ - @Override - public Object saveMarksAndMore(SspMarks sspMarks) { - String result = "NO"; - sspMarks.setMarksTime(sspMarks.getMarksTime() + ":00"); - String simpleUUID = IdUtil.simpleUUID(); - sspMarks.setId(simpleUUID); - //基本信息 - int m = pshMarksMapper.addSspMarks(sspMarks); - - //审批流创建, mainId取基本信息的id - SspMarksflow sspMarksflow = new SspMarksflow(); - sspMarksflow.setMainId(sspMarks.getId()); - sspMarksflow.setCheckState(sspMarks.getCheckState()); - sspMarksflow.setMarksRemark(sspMarks.getMarksRemark()); - sspMarksflow.setCreateTime(sspMarks.getCreateDate()); - sspMarksflow.setCreateUser(sspMarks.getCreateUser()); - - int b = sspMapper.saveSspMarkFlow(sspMarksflow); - //图片 - int c = 0; - JSONArray JSONArray = com.alibaba.fastjson.JSONArray.parseArray(sspMarks.getMarksPicture()); - - for (int i = 0; i < JSONArray.size(); i++) { - String name = "sspImg-"+ UUID.randomUUID()+".jpg"; - String objImg64 = JSONArray.get(i).toString(); - String imgBase64One = objImg64.substring(0, objImg64.indexOf(",")); - String imgBase64 = objImg64.substring(imgBase64One.length()+1, objImg64.length()); - SspMarkfileinfo sspMarkfileinfo = new SspMarkfileinfo(); - Map imgMap = null; - try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - sspMarkfileinfo.setFileUrl(fileName); - } catch (Exception e) { - e.printStackTrace(); - } - sspMarkfileinfo.setFileType(0); - sspMarkfileinfo.setCreateUser(sspMarks.getCreateUser()); - sspMarkfileinfo.setExternalId(sspMarksflow.getId()); - c = sspMapper.saveMarkFileInfo(sspMarkfileinfo); - } - //视频 - if(org.apache.commons.lang3.StringUtils.isNotBlank(sspMarks.getMarksVideo())) { - SspMarkfileinfo sspMarkfileinfo = new SspMarkfileinfo(); - sspMarkfileinfo.setFileUrl(sspMarks.getMarksVideo()); - sspMarkfileinfo.setFileType(1); - sspMarkfileinfo.setCreateUser(sspMarks.getCreateUser()); - sspMarkfileinfo.setExternalId(sspMarksflow.getId()); - sspMapper.saveMarkFileInfo(sspMarkfileinfo); - } - - /** - * 更新图片、视频url - */ - SspMarkfileinfo sspMarkfileinfo = new SspMarkfileinfo(); - sspMarkfileinfo.setExternalId(sspMarksflow.getId()); - String picture = ""; - List sspMarkfileinfoList = pshMarksMapper.queryPictureUrl(sspMarkfileinfo); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < sspMarkfileinfoList.size(); i++) { - sb.append(sspMarkfileinfoList.get(i).getFileUrl()).append(","); - } - picture = sb.toString().substring(0,sb.toString().length()-1); - Map parmsMap = new HashMap<>(); - parmsMap.put("smarkUrl", picture); - parmsMap.put("id", sspMarks.getId()); - pshMarksMapper.updateSmarkUrl(parmsMap); - - parmsMap.put("picture", sspMarkfileinfoList.get(0).getFileUrl()); - //展示一张图片 - pshMarksMapper.updatePicture(parmsMap); - - - List vidceoSspMark = pshMarksMapper.queryVideoUrl(sspMarkfileinfo); - parmsMap.put("video", vidceoSspMark == null || vidceoSspMark.size() == 0?"":vidceoSspMark.get(0).getFileUrl()); - pshMarksMapper.updateVideo(parmsMap); - if( m > 0 && b> 0 && c > 0) { - result = "OK"; - } - return result; - } - - @Override - public int saveQualityMark(JSONObject jsonObject) { - Map map = new HashMap<>(); - map.put("projectId",jsonObject.containsKey("projectId")?jsonObject.getString("projectId"):""); - map.put("workTime",jsonObject.containsKey("workTime")?jsonObject.getString("workTime"):""); - map.put("positionId",jsonObject.containsKey("projectGhId")?jsonObject.getString("projectGhId"):""); - map.put("paragrapId",jsonObject.containsKey("projectPlaceId")?jsonObject.getString("projectPlaceId"):""); - map.put("locationId",jsonObject.containsKey("projectLocationId")?jsonObject.getString("projectLocationId"):""); - map.put("conclusion",jsonObject.containsKey("conclusion")?jsonObject.getString("conclusion"):""); - map.put("szUser",jsonObject.containsKey("SZUser")?jsonObject.getString("SZUser"):""); - map.put("zjUserId",jsonObject.containsKey("ZJUserId")?jsonObject.getString("ZJUserId"):""); - map.put("zbUserId",jsonObject.containsKey("ZBUserId")?jsonObject.getString("ZBUserId"):""); - map.put("jlUserId",jsonObject.containsKey("JLUserId")?jsonObject.getString("JLUserId"):""); - map.put("createUser",jsonObject.containsKey("create_user")?jsonObject.getString("create_user"):""); - String beforeImgs = ""; - String afterImgs = ""; - if(jsonObject.containsKey("beforeImgSrcList")){ - JSONArray jsonArray = jsonObject.getJSONArray("beforeImgSrcList"); - if(jsonArray.size() > 0){ - for(int i = 0;i 0){ - for(int i = 0;i sp = new HashMap<>(); - sp.put("markId",mark_id); - //总包审核人 - if(jsonObject.containsKey("ZBUserId")){ - sp.put("userId",jsonObject.getString("ZBUserId")); - sp.put("userName",jsonObject.getString("ZBUserName")); - sp.put("loginName",jsonObject.getString("ZBUserPhone")); - sp.put("sort",1); - pshMarksMapper.insertSspQualityMarkApprove(sp); - } - if(jsonObject.containsKey("JLUserId")){ - sp.put("userId",jsonObject.getString("JLUserId")); - sp.put("userName",jsonObject.getString("JLUserName")); - sp.put("loginName",jsonObject.getString("JLUserPhone")); - sp.put("sort",2); - pshMarksMapper.insertSspQualityMarkApprove(sp); - } - } - return i; - } - - /** - * 根据流程表id 和文件类型查询图片 - * - * @param sspMarks - * @return - */ - @Override - public List queryPicture(SspMarks sspMarks) { - - return pshMarksMapper.queryPicture(sspMarks); - } - - /** - * 视频 - * - * @param sspMarks - * @return - */ - @Override - public List queryVideo(SspMarks sspMarks) { - return pshMarksMapper.queryVideo(sspMarks); - } - - /** - * 查询留痕上报列表 - * - * @param sspMarks - * @return - */ - @Override - public Map queryMarksList(SspMarks sspMarks) { - Map returnMap = new HashMap<>(); - String projectName = ""; - List publishMarks = new ArrayList<>(); - List publishMarksMy = new ArrayList<>(); - //审核通过 - if("4".equals(sspMarks.getCheckState())) { - publishMarks = pshMarksMapper.selectSspMarksList(sspMarks); - for(SspMarks dbSspMarks:publishMarks){ - projectName = dbSspMarks.getMarksLocation(); - } - } else if("".equals(sspMarks.getCheckState()) ) { - - /*** - * 初始化页面 - */ - sspMarks.setCheckState("4"); - publishMarks = pshMarksMapper.selectSspMarksList(sspMarks); - for(SspMarks dbSspMarks:publishMarks){ - projectName = dbSspMarks.getMarksLocation(); - } - - Map noPassMap = new HashMap<>(); - noPassMap.put("checkState", "1"); - noPassMap.put("projectId", sspMarks.getProjectId()); - - Map daiPassMap = new HashMap<>(); - daiPassMap.put("checkState", "0"); - daiPassMap.put("projectId", sspMarks.getProjectId()); - //没通过 - List noPass = pshMarksMapper.queryByCheckState(noPassMap); - for(SspMarks npSspMarks:noPass) { - publishMarksMy.add(npSspMarks); - } - //待通过 - List daiPass = pshMarksMapper.queryByCheckState(daiPassMap); - for(SspMarks daiPassSmark:daiPass) { - publishMarksMy.add(daiPassSmark); - } - - } else if("-1".equals(sspMarks.getCheckState())) { - - /** - * 搜索 - * - */ - //未通过 - Map noPassMap = new HashMap<>(); - noPassMap.put("checkState", "1"); - noPassMap.put("positionPart", sspMarks.getPositionPart()); - noPassMap.put("projectId", sspMarks.getProjectId()); - - - Map daiPassMap = new HashMap<>(); - daiPassMap.put("checkState", "0"); - daiPassMap.put("positionPart", sspMarks.getPositionPart()); - daiPassMap.put("projectId", sspMarks.getProjectId()); - - //没通过 - List noPass = pshMarksMapper.queryByCheckState(noPassMap); - for(SspMarks npSspMarks:noPass) { - publishMarksMy.add(npSspMarks); - } - //待通过 - List daiPass = pshMarksMapper.queryByCheckState(daiPassMap); - for(SspMarks daiPassSmark:daiPass) { - publishMarksMy.add(daiPassSmark); - } - //获取项目名称 - for(SspMarks dbSspMarks:publishMarksMy){ - projectName = dbSspMarks.getMarksLocation(); - } - } else { - if("0".equals(sspMarks.getCheckState()) || "1".equals(sspMarks.getCheckState())) { - //待审核,审核通过 - publishMarksMy = pshMarksMapper.selectSspMarksList(sspMarks); - for(SspMarks dbPublishMarksMy:publishMarksMy){ - projectName = dbPublishMarksMy.getMarksLocation(); - } - } - } - - //项目地点 - returnMap.put("projectName", projectName); - //发布列表 - returnMap.put("publishMarks", publishMarks); - //发布列表数量 - returnMap.put("publishMarksSize", publishMarks.size()); - - //我的发布列表 - returnMap.put("publishMarksMy", publishMarksMy); - //我的发布列表数量 - returnMap.put("publishMarksMySize", publishMarksMy.size()); - return returnMap; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/controller/SspController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/controller/SspController.java deleted file mode 100644 index 2f2545cb..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/controller/SspController.java +++ /dev/null @@ -1,582 +0,0 @@ -package com.ruoyi.web.sspManage.controller; - -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.QiniuUploadUtil; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.ServerConfig; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.web.sspManage.service.ISspService; -import com.ruoyi.web.sspMarks.domain.ProcessName; -import com.ruoyi.web.sspMarks.domain.SspMarks; -import com.ruoyi.web.sspMarks.service.ISspMarksService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpSession; -import java.util.*; - -/** - * @ClassName:SspController - * @Description:随手拍的控制层 - * @Author: - * @Date:2021/3/31 9:08 - * @version:V1.0 - */ -@Controller -@RequestMapping("/weixin/sspManage") -@CrossOrigin(origins = "*",maxAge = 3600) -public class SspController { - - @Autowired - private ServerConfig serverConfig; - - @Autowired - private ISspService ISspService; - - @Autowired - private ISspMarksService sspMarksService; - - @Autowired - private ISysUserService sysUserService; - - private String prefix = "sspManage"; - - /**********************************************************页面跳转*************************************************/ - /** - * @describe:跳转到列表初始化页 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPage") - public String goListPage(@RequestParam Map map, HttpSession HttpSession, Model Model) { - HttpSession.setAttribute("loginName", map.get("loginName").toString()); - HttpSession.setAttribute("projectId", map.get("projectId").toString()); - HttpSession.setAttribute("projectName", map.get("projectName").toString()); - - Model.addAttribute("projectId", map.get("projectId").toString()); - Model.addAttribute("projectName", map.get("projectName").toString()); - return prefix + "/sspListPage"; - } - - /** - * @describe:跳转到列表页发布记录 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPageBack") - public String goListPageBack(@RequestParam Map map , HttpSession HttpSession , Model Model) { - Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():""); - Model.addAttribute("typeChangeText", map.containsKey("typeChangeText")?map.get("typeChangeText").toString():""); - Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():""); - Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName")); - return prefix + "/sspListPage"; - } - - /** - * @describe:跳转到列表页我发布 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPageMy") - public String goListPageMy(@RequestParam Map map , HttpSession HttpSession , Model Model) { - Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():""); - Model.addAttribute("typeChangeText", map.containsKey("typeChangeText")?map.get("typeChangeText").toString():""); - Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():""); - Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName")); - return prefix + "/sspListPageMy"; - } - - /** - * @describe:跳转到列表页我发布2 - * @author: - * @date:2021/3/31&11:07 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goListPageMy2") - public String goListPageMy2(@RequestParam Map map , HttpSession HttpSession , Model Model) { - Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():""); - Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():""); - Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName")); - return prefix + "/sspListPageMy2"; - } - - /** - * 跳转至质量留痕上报页面 - * @param model - * @return - */ - @RequestMapping("/goNickedSave") - public String goNickedSave(String projectName, Model model, HttpSession session) { - //项目id - model.addAttribute("projectId",session.getAttribute("projectId")); - //项目名称 - model.addAttribute("projectName", projectName); - return prefix + "/reportWithmarks"; - } - - /** - * 跳转至质量留痕上报页面 - * @param model - * @return - */ - @RequestMapping("/goNickedSave2") - public String goNickedSave2(HttpSession session, Model model, String projectName, String projectId) { - String ZJUser = ""; - String ZJUserId = ""; - String ZJUserName = ""; - String ZJUserPhone = ""; - if(session.getAttribute("loginName") != null && !"".equals(session.getAttribute("loginName"))){ - String loginName = session.getAttribute("loginName").toString(); - Map user = ISspService.queryUserInfo(loginName); - if(user != null && user.size() > 0){ - ZJUser = user.get("user_name").toString() + "-" + user.get("login_name").toString(); - ZJUserId = user.get("user_id").toString(); - ZJUserName = user.get("user_name").toString(); - ZJUserPhone = user.get("login_name").toString(); - } - } - model.addAttribute("ZJUser",ZJUser); - model.addAttribute("ZJUserId",ZJUserId); - model.addAttribute("ZJUserName",ZJUserName); - model.addAttribute("ZJUserPhone",ZJUserPhone); - model.addAttribute("projectId",projectId != null && !"".equals(projectId)?projectId:session.getAttribute("projectId")); - model.addAttribute("projectName", projectName); - return prefix + "/reportWithmarks2"; - } - - /** - * @describe:跳转到问题整改的页面 - * @author: - * @date:2021/4/1&10:41 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goChangeSave") - public String goChangeSave(String projectName, Model Model, HttpSession HttpSession) { - //项目名称 - Model.addAttribute("projectName", projectName); - SysUser sysUser = sysUserService.selectUserByUserName(Convert.toStr(HttpSession.getAttribute("loginName"))); - Model.addAttribute("recheckSend", sysUser.getNickName()); - Model.addAttribute("recheckSendUser", sysUser.getPhonenumber()); - Date date = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - //当前时间基础上加3天默认为整改截至时间 - calendar.add(Calendar.DATE, 3); - Model.addAttribute("nickedTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,calendar.getTime())); - return prefix + "/sspChange"; - } - - /********************************************************数据页面跳转************************************************/ - /** - * @describe:跳转到待整改的页面 - * @author: - * @date:2021/4/1&11:04 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goStayCheckPageMy") - public Object goStayCheckPageMy(@RequestParam Map map, Model Model, HttpSession HttpSession) { - map.put("loginUser", HttpSession.getAttribute("loginName")); - Model.addAttribute("queryChangeNicked", ISspService.queryChangeNicked(map)); - return prefix + "/myChanges"; - } - - /** - * @describe:跳转到待审核的页面 - * @author: - * @date:2021/4/1&11:04 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/goStayCheckPage") - public Object goStayCheckPage(@RequestParam Map map, Model Model, HttpSession HttpSession) { - map.put("loginUser", HttpSession.getAttribute("loginName")); - Model.addAttribute("queryChangeNicked", ISspService.queryChangeNicked(map)); - return prefix + "/sspStayCheck"; - } - - /** - * 质量留痕记录审批详情页面 - * @param map - * @param Model - * @param HttpSession - * @return - */ - @RequestMapping("/sspQualityMarkDetail") - public Object sspQualityMarkDetail(@RequestParam Map map, Model Model, HttpSession HttpSession) { - map.put("loginUser", HttpSession.getAttribute("loginName")); - Model.addAttribute("data", ISspService.querySspQualityMarkInfo(map)); - return prefix + "/sspQualityMarkDetail"; - } - - /**********************************************************数据接口*************************************************/ - /** - * @describe:问题整改的列表接口 - * @author: - * @date:2021/3/31&9:10 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/listSspInfoChanges") - public Object listSspInfoChanges(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", HttpSession.getAttribute("projectId")); - map.put("loginName", HttpSession.getAttribute("loginName")); - return ISspService.listSspInfoChanges(map); - } - - /** - * 获取质量留痕数据发布记录 - * @param map - * @param HttpSession - * @return - */ - @ResponseBody - @RequestMapping("/getSspQualityMark") - public Object getSspQualityMark(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - map.put("loginName", HttpSession.getAttribute("loginName")); - return ISspService.querySspQualityMarkList(map); - } - - /** - * 获取当前用户提交的质量留痕数据发布记录 - * @param map - * @param HttpSession - * @return - */ - @ResponseBody - @RequestMapping("/getSspQualityMarkMy") - public Object getSspQualityMarkMy(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId")); - map.put("loginName", HttpSession.getAttribute("loginName")); - return ISspService.querySspQualityMarkMyList(map); - } - - - /** - * @describe:查询随手拍信息的列表(问题整改，留痕上报) - * @author: - * @date:2021/3/31&9:12 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @PostMapping(value = "/listSspInfoMyNicked") - public Object listSspInfoMyNicked(@RequestParam Map map, HttpSession HttpSession) { - map.put("projectId", HttpSession.getAttribute("projectId")); - map.put("createUser", HttpSession.getAttribute("loginName")); - return ISspService.listSspInfoNicked(map); - } - - /** - * @describe:新增整改的信息 - * @author: - * @date:2021/4/1&17:19 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/saveChangeMy") - public Object saveChangeMy(@RequestParam Map map, HttpSession HttpSession) { - map.put("createUser", HttpSession.getAttribute("loginName")); - return ISspService.saveSspInfoChanges(map); - } - - /** - * 新增留痕数据上报 - * - * @param sspMarks - * @param httpSession - * @return - */ - @ResponseBody - @RequestMapping(value = "/saveMarksMy", method = RequestMethod.POST) - public Object saveMarksMy(@RequestBody SspMarks sspMarks, HttpSession httpSession) { - sspMarks.setProjectId(Integer.parseInt(httpSession.getAttribute("projectId").toString())); - sspMarks.setCreateUser(httpSession.getAttribute("loginName").toString()); - return sspMarksService.saveMarksAndMore(sspMarks); - } - - /** - * 质量留痕数据提交 - * - * @param jsonObject - * @param httpSession - * @return - */ - @ResponseBody - @RequestMapping(value = "/saveQualityMark", method = RequestMethod.POST) - public Map saveQualityMark(@RequestBody JSONObject jsonObject, HttpSession httpSession) { - Map resultMap = new HashMap<>(); - jsonObject.put("create_user",httpSession.getAttribute("loginName")==null?"":httpSession.getAttribute("loginName").toString()); - if(sspMarksService.saveQualityMark(jsonObject) == 1){ - resultMap.put("code","200"); - resultMap.put("msg","提交成功"); - }else{ - resultMap.put("code","201"); - resultMap.put("msg","提交失败"); - } - return resultMap; - } - - - /** - * @describe:七牛文件上传token - * @author: - * @date:2021/4/6&14:29 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/getToken") - public String getToken() { return QiniuUploadUtil.getToken();}; - - /** - * @describe:查询用户列表 - * @author: - * @date:2021/4/6&18:02 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @RequestMapping("/queryUserInfo") - @ResponseBody - public Object queryUserInfo(@RequestParam Map map, HttpSession HttpSession) { - map.put("loginName", HttpSession.getAttribute("loginName")); - map.put("projectId", HttpSession.getAttribute("projectId")); - return ISspService.queryUserInfo(map); - } - - /** - * 获取项目用户列表 - * @param map - * @return - */ - @RequestMapping("/queryUserList") - @ResponseBody - public Object queryUserList(@RequestBody Map map){ - return ISspService.queryUserList(map); - } - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/updateChange") - public Object updateChange(@RequestParam Map map, HttpSession HttpSession) { - map.put("createUser", HttpSession.getAttribute("loginName")); - return ISspService.updateState(map); - } - - /** - * 查询留痕上报页面 - * - * @param sspMarks - * @return - */ - @ResponseBody - @RequestMapping("/listMarks") - public Object listMarks(SspMarks sspMarks, HttpSession session) { - sspMarks.setProjectId(Integer.parseInt(session.getAttribute("projectId").toString())); - return sspMarksService.queryMarksList(sspMarks); - } - - - /** - * 回显质量留痕页面 - * - * @param map - * @param model - * @return - */ - @RequestMapping("/goMarksView") - public Object goMarksView(@RequestParam Map map, Model model) { - Map pictureMap = new HashMap<>(); - Map videoMap = new HashMap<>(); - SspMarks sspMarks = new SspMarks(); - sspMarks.setId(map.get("id").toString()); - sspMarks.setCheckState(map.get("numState").toString()); - SspMarks dbSSpMark = sspMarksService.selectSspMarksList(sspMarks).get(0); - String marksPicture = dbSSpMark.getMarksPicture(); - if(StringUtils.isNotBlank(marksPicture)) { - List fileListPicture = sspMarksService.queryPicture(dbSSpMark); - if(fileListPicture != null && fileListPicture.size() > 0) { - pictureMap.put("fileListPictureState", "OK"); - pictureMap.put("fileListPicture", fileListPicture); - } else { - pictureMap.put("fileListPictureState", "NO"); - } - } - if(StringUtils.isNotBlank(dbSSpMark.getMarksVideo())) { - List fileListVideo = sspMarksService.queryVideo(dbSSpMark); - if(fileListVideo != null && fileListVideo.size() > 0) { - videoMap.put("fileListVideoState", "OK"); - videoMap.put("fileListVideo", fileListVideo); - } else { - videoMap.put("fileListVideoState", "NO"); - } - } - model.addAttribute("dbSSpMark",dbSSpMark); - model.addAttribute("pictureMap",pictureMap); - model.addAttribute("videoMap",videoMap); - return prefix + "/sspMarkView"; - } - - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @ResponseBody - @RequestMapping("/sspQualityMarkApprove") - public Object sspQualityMarkApprove(@RequestParam Map map, HttpSession HttpSession) { - map.put("loginName", HttpSession.getAttribute("loginName")); - return ISspService.updateSspQualityMarkApprove(map); - } - - /** - *获取工程类型 - * @param param - * @return - */ - @RequestMapping("/getProjectType") - @ResponseBody - public Object selectProjectTypeList(@RequestParam Map param){ - return ISspService.selectProjectTypeList(param); - } - - @RequestMapping("/treesList") - @ResponseBody - public Map getFatherNode(ProcessName processName) { - Map resultMap = new HashMap<>(); - // 查询所有部门信息 - List treesList = ISspService.selectProcessName("0"); - List newTrees = new ArrayList(); - for (ProcessName department : treesList) { - // 如果pId为0，则该节点为父节点 - if ((department.getParentCode().equals("0"))) { - // 递归获取父节点下的子节点 - department.setList(getChildrenNode(department.getId(), treesList)); - newTrees.add(department); - } - } - resultMap.put("children", newTrees); - System.out.println(resultMap); - return resultMap; - } - - /** - * 递归获取子节点下的子节点 - * @param integer 父节点的ID - * @param treesList 所有菜单树集合 - * @return - */ - private List getChildrenNode(String integer, List treesList) { - List newTrees = new ArrayList(); - for (ProcessName department : treesList) { - if ((department.getParentCode().equals("0"))) { - continue; - } - if (department.getParentCode().equals(integer)) { - // 递归获取子节点下的子节点，即设置树控件中的children - department.setList(getChildrenNode(department.getId(), treesList)); - newTrees.add(department); - } - } - return newTrees; - } - - /** - * 查询工程编码、名称 - * @return - */ - @RequestMapping("selectCodeFromSmark") - @ResponseBody - public Object selectCodeFromSmark(String projectId) { - return ISspService.querySmarkCode(projectId); - } - - /** - * 通用上传请求（单个） - */ - @PostMapping("/upload") - @ResponseBody - public AjaxResult uploadFile(MultipartFile file) throws Exception - { - try - { - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + fileName; - AjaxResult ajax = AjaxResult.success(); - ajax.put("url", url); - ajax.put("fileName", fileName); - ajax.put("newFileName", FileUtils.getName(fileName)); - ajax.put("originalFilename", file.getOriginalFilename()); - return ajax; - } - catch (Exception e) - { - return AjaxResult.error(e.getMessage()); - } - } - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/mapper/SspMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/mapper/SspMapper.java deleted file mode 100644 index 40da5ffc..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/mapper/SspMapper.java +++ /dev/null @@ -1,396 +0,0 @@ -package com.ruoyi.web.sspManage.mapper; - -import com.ruoyi.web.sspMarks.domain.ProcessName; -import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo; -import com.ruoyi.web.sspMarks.domain.SspMarksflow; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName:sspMapper - * @Description:随手拍的数据层 - * @Author: - * @Date:2021/3/30 15:23 - * @version:V1.0 - */ -@Repository -public interface SspMapper { - - /** - * @describe:查询随手拍信息的列表(问题整改) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listSspInfoChanges(Map map); - - - /** - * @describe:查询随手拍信息的列表(问题整改，留痕上报) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listSspInfoMyNicked(Map map); - - /** - * @describe:根据id查询相关基本信息 - * @author: - * @date:2021/4/1&11:15 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryChangeNickedInfo(Map map); - - /** - * @describe:根据id查询相关的文件 - * @author: - * @date:2021/4/1&11:19 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listChangeNickedFile(Map map); - - /** - * @describe:新增问题整改主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspInfoChanges(Map map); - - /** - * @describe:新增留痕上报主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspInfoNicked(Map map); - - /** - * @describe:修改留痕上报主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int updateSmzSspProblemmodify(Map map); - - /** - * @describe:新增流程信息 - * @author: - * @date:2021/3/31&9:27 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspAuditInfo(Map map); - - /** - * @describe:新增文件信息 - * @author: - * @date:2021/3/31&9:36 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspFileInfo(Map map); - - /** - * @describe:修改状态 - * @author: - * @date:2021/4/2&11:28 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int updateState(Map map); - - /** - * @describe:修改状态 - * @author: - * @date:2021/4/2&11:28 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int updateStateOk(Map map); - - /** - * @describe:查询已整改的基本信息 - * @author: - * @date:2021/4/6&9:57 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryOpinion(Map map); - - /** - * @describe:查询已整改的基本信息 - * @author: - * @date:2021/4/6&9:57 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryOpinionChange(Map map); - - /** - * @describe:查询已整改的文件信息 - * @author: - * @date:2021/4/6&9:59 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listOpinionFile(Map map); - - /** - * @describe:查询人员的信息 - * @author: - * @date:2021/4/6&17:18 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listUserInfo(Map map); - - /** - * 根据用户账号查询用户信息 - * @param loginName - * @return - */ - public Map queryUserInfo(String loginName); - - /** - * 获取项目用户列表 - * @param map - * @return - */ - public List> queryUserList(Map map); - - /** - * @describe:查询负责人的项目归属 - * @author: - * @date:2021/4/6&17:24 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryUserProjectInfo(Map map); - - /** - * @describe:添加驳回的审核意见 - * @author: - * @date:2021/4/7&15:35 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspAuditInfoReject(Map map); - - /** - * @describe:添加通过的审核意见 - * @author: - * @date:2021/4/7&15:35 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public int saveSspAuditInfoPass(Map map); - - /** - * @describe:查询当前审核流程的信息 - * @author: - * @date:2021/4/7&16:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryAuditInfo(Map map); - - /** - * @describe:查询驳回信息 - * @author: - * @date:2021/4/7&16:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public String queryRejectInfo(Map map); - - - /** - * @describe:查询N次提交的图片信息 - * @author: - * @date:2021/4/7&17:18 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> listRejectFile(Map map); - - - /** - * 新增留痕上报流程 - * - * @param sspMarksflow - * @return - */ - int saveSspMarkFlow(SspMarksflow sspMarksflow); - - /** - * 新增留痕审批文件 - * - * @param sspMarkfileinfo - * @return - */ - int saveMarkFileInfo(SspMarkfileinfo sspMarkfileinfo); - - - /** - * 根据type获取url - * - * @return - */ - Map queryFileInfo(Map map); - - /** - * 获取质量留痕数据发布记录 - * @param map - * @return - */ - List> querySspQualityMarkList(Map map); - - /** - * 获取当前用户提交的质量留痕数据发布记录 - * @param map - * @return - */ - List> querySspQualityMarkMyList(Map map); - - /** - * 查询项目用户信息 - * @param map - * @return - */ - List> queryProjectUserinfo(Map map); - - /** - * 获取质量留痕记录详情 - * @param map - * @return - */ - Map querySspQualityMarkInfo(Map map); - - /** - * 获取质量留痕审批流下一个待审批账号 - * @param map - * @return - */ - String querySspQualityMarkApproveNextLoginName(Map map); - - /** - * 获取质量留痕审批流待审批数量 - */ - int querySspQualityMarkToBeApprovedNum(Map map); - - /** - * 更新隐蔽工程留痕记录审批流审批状态 - * @param map - * @return - */ - int updateSspQualityMarkApproveState(Map map); - - /** - * 更新隐蔽工程留痕记录审批状态 - * @param map - * @return - */ - int updateSspQualityMarkState(Map map); - - /** - * 查询工程类型列表 - * - * @param projectType 工程类型信息 - * @return 工程类型集合 - */ - public List> selectProjectTypeList(Map projectType); - - /** - * 查询关键工序名称列表 - * - * @param isDel - * @return - */ - List selectProcessName(String isDel); - - /** - * 根据入工区编码, 查询工程编码 - * - * @param proId - * @return - */ - List> selectCodeFromSmark(String proId); - - /** - * 查询项目单位 - * - * @param projectId - * @return - */ - List> selectComByProjectId(String projectId); - - /** - * 查询所有项目人员 - * - * @param map - * @return - */ - List> selectAllProjectUser(Map map); - - /** - * 查询所有项目人员 - * - * @param map - * @return - */ - List> selectProjectUser(Map map); - - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/ISspService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/ISspService.java deleted file mode 100644 index 7c487536..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/ISspService.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.ruoyi.web.sspManage.service; - -import com.ruoyi.web.sspMarks.domain.ProcessName; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName:SspService - * @Description:随手拍服务层 - * @Author: - * @Date:2021/3/30 17:03 - * @version:V1.0 - */ -public interface ISspService { - - /** - * @describe:查询随手拍信息的列表(问题整改) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map listSspInfoChanges(Map map); - - - /** - * @describe:查询随手拍信息的列表(留痕上报) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Object listSspInfoNicked(Map map); - - /** - * @describe:查询审批流的信息 - * @author: - * @date:2021/4/1&11:49 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Map queryChangeNicked(Map map); - - /** - * @describe:新增问题整改主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public String saveSspInfoChanges(Map map); - - /** - * @describe:查询人员的信息 - * @author: - * @date:2021/4/6&17:26 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public List> queryUserInfo(Map map); - - /** - * 根据用户账号查询用户信息 - * @param loginName - * @return - */ - public Map queryUserInfo(String loginName); - - /** - * 获取项目用户列表 - * @param map - * @return - */ - public List> queryUserList(Map map); - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - public Object updateState(Map map); - - /** - * 获取质量留痕数据发布记录 - * @return - */ - public Map querySspQualityMarkList(Map map); - - /** - * 获取当前用户提交的质量留痕数据发布记录 - * @param map - * @return - */ - public Map querySspQualityMarkMyList(Map map); - - /** - * 获取质量留痕记录详情 - * @param map - * @return - */ - public Map querySspQualityMarkInfo(Map map); - - /** - * 隐蔽工程留痕记录审批 - * @param map - * @return - */ - public Map updateSspQualityMarkApprove(Map map); - - /** - * 查询工程类型列表 - * - * @param projectType 工程类型信息 - * @return 工程类型集合 - */ - public List> selectProjectTypeList(Map projectType); - - /** - * 查询关键工序名称列表 - * - * @param isDel - * @return - */ - List selectProcessName(String isDel); - - /** - * 根据入参查询智能公司工区名称、工区编号 - * - * @param proId - * @return - */ - Map querySmarkCode(String proId); -} \ No newline at end of file diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java deleted file mode 100644 index 6e4c5a3e..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java +++ /dev/null @@ -1,610 +0,0 @@ -package com.ruoyi.web.sspManage.service; - -import com.alibaba.fastjson.JSONArray; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DeptTypeEnum; -import com.ruoyi.common.enums.PublicStateEnum; -import com.ruoyi.common.enums.SysRoleEnum; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.QiniuBase64UploadUtil; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.web.projectInfo.mapper.WxProjectInfoMapper; -import com.ruoyi.web.sspManage.mapper.SspMapper; -import com.ruoyi.web.sspMarks.domain.ProcessName; -import com.ruoyi.web.userLogin.mapper.WxUserLoginMapper; -import com.ruoyi.web.utils.MultipartFileUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import java.util.*; - -/** - * @ClassName:ISspServiceImpl - * @Description:TODO - * @Author: - * @Date:2021/3/30 17:04 - * @version:V1.0 - */ -@Service -public class SspServiceImpl implements ISspService { - - @Autowired - private SspMapper sspMapper; - - @Autowired - private WxUserLoginMapper wxUserLoginMapper; - - @Autowired - private SysRoleMapper sysRoleMapper; - - @Autowired - private SysDeptMapper sysDeptMapper; - - @Autowired - private WxProjectInfoMapper wxProjectInfoMapper; - - /** - * @describe:查询随手拍信息的列表(问题整改) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public Map listSspInfoChanges(Map map) { - //返回 - Map resultMap = new HashMap<>(); - /** - * 根据获取的用户信息和项目id进行判断是抄送还是主送 - * showState - * 主送状态0 - * 抄送状态1 - * */ - String thisUser = map.get("loginName").toString(); - String projectName = ""; - //查询问题整改数据(发布记录) - List> allChangesInfo = sspMapper.listSspInfoChanges(map); - if(allChangesInfo != null && allChangesInfo.size() > 0) { - //循环数据，判断加主送抄送状态 - for (int i = 0; i < allChangesInfo.size(); i++) { - Map infoMap = allChangesInfo.get(i); - //主送人 - String lordSendUser = infoMap.get("lordSentUser").toString(); - if(thisUser.equals(lordSendUser)) { - //待办的 - infoMap.put("showState","0"); - } else { - //抄送的 - infoMap.put("showState","1"); - } - projectName = infoMap.get("projectName").toString(); - } - } - //查询问题整改数据(我的发布) - //(0问题整改, 1质量留痕) - - /** - * 如果没有选择默认是问题整改 - */ - if(StringUtils.isBlank(map.get("infoType").toString())) { - map.put("infoType", "0"); - } - List> allNickedInfo = sspMapper.listSspInfoMyNicked(map); - if(allNickedInfo != null && allNickedInfo.size() > 0) { - //循环数据，判断加主送抄送状态 - for (int i = 0; i < allNickedInfo.size(); i++) { - Map infoMap = allNickedInfo.get(i); - String lordSendUser = infoMap.get("lordSentUser").toString(); - if(thisUser.equals(lordSendUser)) { - //待办理 - infoMap.put("showState","0"); - } else { - //抄送的 - infoMap.put("showState","1"); - } - } - } - //工程名称 - resultMap.put("projectName", projectName); - //发布记录 - resultMap.put("allChangesInfo", allChangesInfo); - //我的发布 - resultMap.put("allNickedInfo", allNickedInfo); - //发布记录数量 - resultMap.put("allChangesInfoSize", allChangesInfo != null?allChangesInfo.size():0); - //我的发布数量 - resultMap.put("allNickedInfoSize", allNickedInfo != null?allNickedInfo.size():0); - return resultMap; - } - - /** - * @describe:查询随手拍信息的列表(留痕上报[问题整改我发起的]) - * @author: - * @date:2021/3/30&15:25 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - @Transactional - public Object listSspInfoNicked(Map map) { - String result = "NO"; - //根据infoTy判断是问题整改或者是留痕上报 - //String infoType = map.get("infoType").toString(); - if(true) { - Map updateMap = new HashMap<>(); - //问题整改 - Map dataMap = new HashMap<>(); - dataMap.put("loginName",map.get("createUser")); - Map deptMap = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("createUser"))); - //当前角色时管理员时，修改角色为集团公司 - String roleType = ""; - if(DeptTypeEnum.JTGS.getCode().equals(deptMap.get("type_flag"))){ - List> datalist = sspMapper.queryProjectUserinfo(map); - if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).get("job_type"))){ - //说明是甲方经理 - roleType = DeptTypeEnum.JFDBTYPE.getCode(); - }else{ - roleType = DeptTypeEnum.JTGSTYPE.getCode(); - } - }else if(DeptTypeEnum.ZGS.getCode().equals(deptMap.get("type_flag"))){ - List> datalist = sspMapper.queryProjectUserinfo(map); - if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).get("job_type"))){ - //说明是甲方经理 - roleType = DeptTypeEnum.JFDBTYPE.getCode(); - }else{ - roleType = DeptTypeEnum.ZGSTYPE.getCode(); - } - }else if(DeptTypeEnum.JLDW.getCode().equals(deptMap.get("type_flag"))){ - roleType = DeptTypeEnum.JLDWTYPE.getCode(); - }else if(DeptTypeEnum.ZBDW.getCode().equals(deptMap.get("type_flag"))){ - roleType = DeptTypeEnum.ZBDWTYPE.getCode(); - }else if(DeptTypeEnum.FBDW.getCode().equals(deptMap.get("type_flag"))){ - roleType = DeptTypeEnum.FBDWTYPE.getCode(); - } - map.put("roleType",roleType); - /** - * 基本信息入库 - * 图片 视频入库 - * 添加对应的审批流 - * */ - //基本信息 - map.put("nickedTime", DateUtils.parseDate(map.get("nickedTime"))); - int a = sspMapper.saveSspInfoChanges(map); - //审批流创建 - map.put("mainId", map.get("id")); - map.put("processState", "1"); - updateMap.put("id",map.get("id")); - int b = sspMapper.saveSspAuditInfo(map); - //图片 - int c = 0; - JSONArray JSONArray = com.alibaba.fastjson.JSONArray.parseArray(map.get("imgSrc").toString()); - String smarkUrl=""; - for (int i = 0; i < JSONArray.size(); i++) { - //String name = "sspImg-"+ UUID.randomUUID()+".jpg"; - String objImg64 = JSONArray.get(i).toString(); - //String imgBase64One = objImg64.substring(0, objImg64.indexOf(",")); - //String imgBase64 = objImg64.substring(imgBase64One.length()+1, objImg64.length()); - Map imgMap = new HashMap<>(); - try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - //imgMap = new QiniuBase64UploadUtil().put64image(imgBase64, name); - smarkUrl+=","+fileName; - imgMap.put("fileUrl", fileName); - } catch (Exception e) { - e.printStackTrace(); - } - imgMap.put("auditId", map.get("auditId")); - imgMap.put("fileType", "0"); - //imgMap.put("fileUrl", imgMap.get("url")); - imgMap.put("createUser", map.get("createUser")); - c = sspMapper.saveSspFileInfo(imgMap); - } - //视频 - if(!"".equals(map.get("videoUrl").toString())) { - Map fileArgsMap = new HashMap<>(16); - fileArgsMap.put("auditId", map.get("auditId")); - fileArgsMap.put("createUser", map.get("createUser")); - fileArgsMap.put("fileType", "1"); - fileArgsMap.put("fileUrl", map.get("videoUrl")); - sspMapper.saveSspFileInfo(fileArgsMap); - } - smarkUrl = smarkUrl.substring(1); - updateMap.put("marksPicture",smarkUrl.split(",")[0]); - updateMap.put("smarkUrl",smarkUrl); - sspMapper.updateSmzSspProblemmodify(updateMap); - if(a > 0 && b > 0 && c > 0) { - result = "OK"; - } - } else { - - } - return result; - } - - @Override - public Map queryChangeNicked(Map map) { - //基本信息 - Map ChangeNickedInfo = sspMapper.queryChangeNickedInfo(map); - //获取流程的id,请求相关的文件信息 - map.put("auditId",ChangeNickedInfo.get("checkId")); - map.put("fileType","0"); - //图片 - List> fileListImg = sspMapper.listChangeNickedFile(map); - if(fileListImg != null && fileListImg.size() > 0) { - ChangeNickedInfo.put("fileListImgState", "OK"); - ChangeNickedInfo.put("fileListImg", fileListImg); - } else { - ChangeNickedInfo.put("fileListImgState", "NO"); - ChangeNickedInfo.put("fileListImg", new ArrayList<>()); - } - //视频 - //map.put("fileType","1"); - //List> fileListVideo = sspMapper.listChangeNickedFile(map); - //if(fileListVideo != null && fileListVideo.size() > 0) { - // ChangeNickedInfo.put("fileListVideoState", "OK"); - // ChangeNickedInfo.put("fileListVideo", fileListVideo); - //} else { - ChangeNickedInfo.put("fileListVideoState", "NO"); - //} - //审核流程的信息 查询状态为0的信息 基本信息和文件信息 当前审批流是否存在驳回 - Map opinionMap; - if("2".equals(map.get("numState").toString()) || "3".equals(map.get("numState").toString())) { - opinionMap = sspMapper.queryOpinionChange(map); - } else { - opinionMap = sspMapper.queryOpinion(map); - } - ChangeNickedInfo.put("opinion", opinionMap.get("opinion")==null?"":opinionMap.get("opinion")); - ChangeNickedInfo.put("opinionCreateTime", opinionMap.get("opinionCreateTime")); - - /*****************************************************驳回判断**************************************************/ - //当前审核信息状态 - Map auditInfoMap = sspMapper.queryAuditInfo(map); - //是否有驳回 - String rejectInfo = sspMapper.queryRejectInfo(map); - if(("0".equals(auditInfoMap.get("processState")) || !auditInfoMap.containsKey("processState")) && rejectInfo == null) { - //初始审核状态 - List> opinionFileUrl = sspMapper.listOpinionFile(map); - if(opinionFileUrl != null && opinionFileUrl.size() > 0) { - ChangeNickedInfo.put("opinionFileUrlState", "OK"); - ChangeNickedInfo.put("opinionFileUrl", opinionFileUrl); - ChangeNickedInfo.put("rejectState", "NO"); - } else { - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - ChangeNickedInfo.put("rejectState", "NO"); - } - } else if("0".equals(auditInfoMap.get("processState")) && rejectInfo != null) { - //被驳回的状态 以N次提交 - map.put("id", auditInfoMap.get("id")); - List> opinionFileUrl = sspMapper.listRejectFile(map); - if(opinionFileUrl != null && opinionFileUrl.size() > 0) { - ChangeNickedInfo.put("opinionFileUrlState", "OK"); - ChangeNickedInfo.put("opinionFileUrl", opinionFileUrl); - ChangeNickedInfo.put("rejectState", "OK"); - ChangeNickedInfo.put("rejectInfo", rejectInfo); - } else { - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - ChangeNickedInfo.put("rejectState", "OK"); - ChangeNickedInfo.put("rejectInfo", rejectInfo); - } - } else if("2".equals(auditInfoMap.get("processState")) && rejectInfo != null) { - //被驳回且没有再次上传 - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - ChangeNickedInfo.put("rejectState", "OK"); - ChangeNickedInfo.put("rejectInfo", rejectInfo); - }else{ - ChangeNickedInfo.put("rejectState", "NO"); - ChangeNickedInfo.put("opinionFileUrlState", "NO"); - } - - /**************************************************************************************************************/ - if(map.get("loginUser").equals(ChangeNickedInfo.get("recheckSendUser"))) { - ChangeNickedInfo.put("checkUserState", "OK"); - } else { - ChangeNickedInfo.put("checkUserState", "NO"); - } - ChangeNickedInfo.put("numState", map.get("numState")); - return ChangeNickedInfo; - } - - /** - * @describe:新增问题整改主表信息 - * @author: - * @date:2021/3/31&9:22 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public String saveSspInfoChanges(Map map) { - //修改信息表的状态 - map.put("tableName", "smz_ssp_problemmodify"); - map.put("fieldName", "checkState"); - map.put("checkState", "1"); - map.put("keySet", "id"); - int a = sspMapper.updateState(map); - //审批信息入库 - map.put("mainId", map.get("id")); - map.put("opinion", map.get("opinion")); - map.put("processState", "0"); - int b = sspMapper.saveSspAuditInfo(map); - int c = 0; - //图片入库 - JSONArray JSONArray = com.alibaba.fastjson.JSONArray.parseArray(map.get("imgSrc").toString()); - for (int i = 0; i < JSONArray.size(); i++) { - String name = "sspImg-"+ UUID.randomUUID()+".jpg"; - String objImg64 = JSONArray.get(i).toString(); - String imgBase64One = objImg64.substring(0, objImg64.indexOf(",")); - String imgBase64 = objImg64.substring(imgBase64One.length()+1, objImg64.length()); - Map imgMap = new HashMap<>(); - try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - //imgMap = new QiniuBase64UploadUtil().put64image(imgBase64, name); - imgMap.put("fileUrl", fileName); - } catch (Exception e) { - e.printStackTrace(); - } - imgMap.put("auditId", map.get("auditId")); - imgMap.put("fileType", "0"); - //imgMap.put("fileUrl",imgMap.get("url")); - imgMap.put("createUser", map.get("createUser")); - c = sspMapper.saveSspFileInfo(imgMap); - } - if(a > 0 && b > 0 && c > 0) { - return "OK"; - } - return "NO"; - } - - /** - * @describe:查询人员的信息 - * @author: - * @date:2021/4/6&17:26 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public List> queryUserInfo(Map map) { - String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleIdByLoginName(Convert.toStr(map.get("loginName")))); - //查询出公司信息 - List> comList = sspMapper.selectComByProjectId(Convert.toStr(map.get("projectId"))); - Map userdata = new HashMap<>(); - userdata.put("projectId",Convert.toLong(map.get("projectId"))); - userdata.put("name",map.get("name")); - userdata.put("loginName",map.get("loginName")); - if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) || SysRoleEnum.ZGS.getCode().equals(nowRole)){ - userdata.put("roleId",SysRoleEnum.ZGS.getCode()); - //查询所属项目部门信息 - Map sysDept = wxProjectInfoMapper.selectDeptByProjectId(Convert.toLong(map.get("projectId"))); - userdata.put("deptId",Convert.toStr(sysDept.get("id"))); - }else if(SysRoleEnum.JLDW.getCode().equals(nowRole)){ - //监理单位只能选择监理单位 - userdata.put("roleId",SysRoleEnum.JLDW.getCode()); - //查询部门信息 - Map sysDept = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("loginName"))); - userdata.put("deptId",Convert.toStr(sysDept.get("id"))); - }else if(SysRoleEnum.ZBDW.getCode().equals(nowRole)){ - //总包单位只能选择总包单位 - userdata.put("roleId",SysRoleEnum.ZBDW.getCode()); - //查询部门信息 - Map sysDept = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("loginName"))); - userdata.put("deptId",Convert.toStr(sysDept.get("id"))); - }else if(SysRoleEnum.FBDW.getCode().equals(nowRole)){ - //分包单位只能选择分包单位 - userdata.put("roleId",SysRoleEnum.FBDW.getCode()); - //查询部门信息 - Map sysDept = wxProjectInfoMapper.selectDeptByUserName(Convert.toStr(map.get("loginName"))); - userdata.put("deptId",Convert.toStr(sysDept.get("id"))); - } - //查询相关人员 - List> userList = null; - if(SysRoleEnum.COMMON.getCode().equals(nowRole)){ - userList = sspMapper.selectProjectUser(userdata); - }else{ - userList = sspMapper.selectAllProjectUser(userdata); - } - for(Map comMap:comList){ - List> userInfoList = new ArrayList<>(); - for(Map userMap:userList){ - //同一部门组装数据 - if(comMap.get("id").toString().equals(userMap.get("deptId").toString())){ - userInfoList.add(userMap); - }else if(DeptTypeEnum.ZGS.getCode().equals(comMap.get("unitType").toString()) && DeptTypeEnum.ZGS.getCode().equals(userMap.get("role_id").toString())){ - userInfoList.add(userMap); - }else if(DeptTypeEnum.ZGS.getCode().equals(comMap.get("unitType").toString()) && DeptTypeEnum.ZGS.getCode().equals(userMap.get("dept_type_flag").toString())){ - userInfoList.add(userMap); - } - } - comMap.put("people",userInfoList); - } - return comList; - } - - @Override - public Map queryUserInfo(String loginName) { - return sspMapper.queryUserInfo(loginName); - } - - @Override - public List> queryUserList(Map map) { - List> resultList = new ArrayList<>(); - Map user = new HashMap<>(); - List> userList = sspMapper.queryUserList(map); - if(userList != null && userList.size() > 0){ - user.put("people",userList); - } - resultList.add(user); - return resultList; - } - - /** - * @describe:修改审核流程的状态 - * @author: - * @date:2021/4/7&11:39 - * @version:V1.0 - * @param: - * @return: - * @Exception: - */ - @Override - public Object updateState(Map map) { - /** - * 根据状态修改 - * 4通过 - * 3为驳回 - * */ - int code = 0; - int codeA = 0; - if("4".equals(map.get("checkState").toString())) { - //通过 修改主表状态 为通过 - map.put("tableName", "smz_ssp_problemmodify"); - map.put("fieldName", "checkState"); - map.put("checkState", map.get("checkState")); - map.put("keySet", "id"); - code = sspMapper.updateStateOk(map); - //添加通过意见 - Map rejectMap = new HashMap<>(16); - rejectMap.put("mainId", map.get("id")); - rejectMap.put("opinion", map.get("opinion")); - rejectMap.put("createUser", map.get("createUser")); - codeA = sspMapper.saveSspAuditInfoPass(rejectMap); - } else { - //驳回 修改主表状态 待整改 添加审核流程驳回意见 - map.put("tableName", "smz_ssp_problemmodify"); - map.put("fieldName", "checkState"); - map.put("checkState", "0"); - map.put("keySet", "id"); - code = sspMapper.updateState(map); - //添加驳回意见 - Map rejectMap = new HashMap<>(16); - rejectMap.put("mainId", map.get("id")); - rejectMap.put("opinion", map.get("opinion")); - rejectMap.put("createUser", map.get("createUser")); - codeA = sspMapper.saveSspAuditInfoReject(rejectMap); - } - return code + codeA; - } - - @Override - public Map querySspQualityMarkList(Map map) { - Map resultMap = new HashMap<>(); - List> list = sspMapper.querySspQualityMarkList(map); - List> list_my = sspMapper.querySspQualityMarkMyList(map); - resultMap.put("list",list); - resultMap.put("list_num",list != null?list.size():0); - resultMap.put("list_my_num",list_my != null?list_my.size():0); - return resultMap; - } - - @Override - public Map querySspQualityMarkMyList(Map map) { - Map resultMap = new HashMap<>(); - List> list = sspMapper.querySspQualityMarkList(map); - List> list_my = sspMapper.querySspQualityMarkMyList(map); - resultMap.put("list",list_my); - resultMap.put("list_num",list != null?list.size():0); - resultMap.put("list_my_num",list_my != null?list_my.size():0); - return resultMap; - } - - @Override - public Map querySspQualityMarkInfo(Map map) { - Map data = sspMapper.querySspQualityMarkInfo(map); - String[] arr; - if(data.containsKey("before_imgs") && !"".equals(data.get("before_imgs"))){ - arr = data.get("before_imgs").toString().split(","); - data.put("before_imgs",arr); - } - if(data.containsKey("after_imgs") && !"".equals(data.get("after_imgs"))){ - arr = data.get("after_imgs").toString().split(","); - data.put("after_imgs",arr); - } - int approve_state = 0;//(0:不可审批;1:可审批) - if(Integer.parseInt(data.get("state").toString()) == 0){//待审批 - String next_approve_login_name = sspMapper.querySspQualityMarkApproveNextLoginName(map); - String loginUser = map.containsKey("loginUser")?map.get("loginUser").toString():""; - if(next_approve_login_name != null && next_approve_login_name.equals(loginUser)){ - approve_state = 1; - } - } - data.put("approve_state",approve_state); - return data; - } - - @Override - public Map updateSspQualityMarkApprove(Map map) { - Map resultMap = new HashMap<>(); - if("2".equals(map.get("state").toString())){//驳回 - if(sspMapper.updateSspQualityMarkApproveState(map) == 1){ - if(sspMapper.updateSspQualityMarkState(map) == 1){ - resultMap.put("code","200"); - resultMap.put("msg","审批成功！"); - } - } - }else if("1".equals(map.get("state").toString())){//通过 - if(sspMapper.updateSspQualityMarkApproveState(map) == 1){ - if(sspMapper.querySspQualityMarkToBeApprovedNum(map) == 0){ - if(sspMapper.updateSspQualityMarkState(map) == 1){ - resultMap.put("code","200"); - resultMap.put("msg","审批成功！"); - }else{ - resultMap.put("code","201"); - resultMap.put("msg","审批失败！"); - } - }else{ - resultMap.put("code","200"); - resultMap.put("msg","审批成功！"); - } - }else { - resultMap.put("code","201"); - resultMap.put("msg","审批失败！"); - } - } - return resultMap; - } - - @Override - public List> selectProjectTypeList(Map projectType) { - return sspMapper.selectProjectTypeList(projectType); - } - - @Override - public List selectProcessName(String isDel) { - return sspMapper.selectProcessName(isDel); - } - - @Override - public Map querySmarkCode(String proId) { - Map returnMap = new HashMap<>(); - List> ponitCode = sspMapper.selectCodeFromSmark(proId); - if(ponitCode.size() > 0 || ponitCode != null) { - returnMap.put("code", "200"); - returnMap.put("msg", "查询成功"); - returnMap.put("ponitCode", ponitCode); - } else { - returnMap.put("code", "100"); - returnMap.put("msg", "请检查参数"); - } - return returnMap; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/ProcessName.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/ProcessName.java deleted file mode 100644 index 1f3cf6cd..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/ProcessName.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.ruoyi.web.sspMarks.domain; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 关键工序名称 - * - */ -public class ProcessName { - - private String id; - - /** - * 关键工序名称 - */ - private String name; - - /** - * 父id - */ - private String parentCode; - - /** - * 项目id - * - */ - private int projectId; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 是否可删除 - */ - private int isDel; - - /** - * 节点级别 - * - */ - private int processLevel; - - /** - * 审核状态 - */ - private int checkState; - - /** - * 类别 - */ - private String type; - - private List list = new ArrayList<>(); - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getParentCode() { - return parentCode; - } - - public void setParentCode(String parentCode) { - this.parentCode = parentCode; - } - - public int getProjectId() { - return projectId; - } - - public void setProjectId(int projectId) { - this.projectId = projectId; - } - - public Date getCreateDate() { - return createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public int getProcessLevel() { - return processLevel; - } - - public void setProcessLevel(int processLevel) { - this.processLevel = processLevel; - } - - public int getCheckState() { - return checkState; - } - - public void setCheckState(int checkState) { - this.checkState = checkState; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarkfileinfo.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarkfileinfo.java deleted file mode 100644 index 7d37116c..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarkfileinfo.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.ruoyi.web.sspMarks.domain; - -/** - * 留痕上报上传的文件 - */ -public class SspMarkfileinfo { - /** id */ - private Integer id; - /** - * 关联id - */ - private int externalId; - - /** - * 文件类型（0图片，1视频） - */ - private int fileType; - - /** - * 文件url - */ - private String fileUrl; - - - - /** - * 是否可删除 - */ - private int isDel; - - /** - * 创建人 - */ - private String createUser; - - /** - * 创建时间 - */ - private String createTime; - - /** - * 更新人 - */ - private String updateUser; - - /** - * 更新时间 - */ - private String updateTime; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public int getExternalId() { - return externalId; - } - - public void setExternalId(int externalId) { - this.externalId = externalId; - } - - public int getFileType() { - return fileType; - } - - public void setFileType(int fileType) { - this.fileType = fileType; - } - - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - - public String getUpdateUser() { - return updateUser; - } - - public void setUpdateUser(String updateUser) { - this.updateUser = updateUser; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getFileUrl() { - return fileUrl; - } - - public void setFileUrl(String fileUrl) { - this.fileUrl = fileUrl; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarks.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarks.java deleted file mode 100644 index b8a55435..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarks.java +++ /dev/null @@ -1,536 +0,0 @@ -package com.ruoyi.web.sspMarks.domain; - -import com.ruoyi.common.annotation.Excel; - -/** - * 随手拍留痕上报表 smz_ssp_marks - * - * @author gwb - * @date 2021-04-06 - */ -public class SspMarks -{ - private static final long serialVersionUID = 1L; - - /** id */ - private String id; - /** 留痕上报地点 */ - @Excel(name = "留痕上报地点") - private String marksLocation; - /** 留痕时间 */ - @Excel(name = "留痕时间") - private String marksTime; - /** 留痕图片 */ - private String marksPicture; - /** 留痕视频 */ - private String marksVideo; - /** 工程类型 */ - private String projectType; - /** 工序名称 */ - private String processName; - /** 问题描述 */ - @Excel(name = "问题描述") - private String positionPart; - /** 留痕说明 */ - @Excel(name = "留痕说明") - private String marksRemark; - /** 审核人 */ - @Excel(name = "施工人员姓名") - private String auditorPerson; - /** 审核人手机 */ - private String auditorPhone; - /** 审批状态 */ - private String checkState; - - /** 创建时间 */ - private String createDate; - /** 创建人 */ - private String createUser; - /** 项目id */ - private Integer projectId; - /** 工程名称 */ - private String projectName; - - /** - * 施工人员身份证号码 - */ - @Excel(name = "施工人员身份证号码") - private String idcardnum; - - /** - * 给智能公司传递的url - */ - private String smarkUrl; - - /** - * 工程名称 - */ - private String pointName; - - /** - * 监理人员 - */ - private String surveyorName; - - /** - * 监理身份证号码 - */ - private String surveyorId; - - /** - * 监理留痕时间 - */ - private String surveyorTime; - - /** - * 监理留痕说明 - */ - private String surveyorContent; - - /** - * 更新时间 - */ - private String updateDate; - - - /** - * 工程类型 - */ - @Excel(name = "工程类型") - private String typeOfProject; - - /** - * 工序 - */ - @Excel(name = "工序名称") - private String procedure; - - /** - * 工程名称 - */ - @Excel(name = "工程名称") - private String engineeringName; - - /** - * 留痕上报的id为1 - */ - private int infoType; - - /** - * 开始时间结束时间 - */ - private String startTime; - private String endTime; - - /** - * 开始时间,结束时间 - */ - private String beginDate; - private String endDate; - - /** - * 同步状态 （0是已同步） - */ - private int synchronization; - - /** - * 查询参数 - * - * @return - */ - private Integer nowPage; - private Integer size; - - //工程关联字段 - private String name; - - /** - * 流程表的id - */ - private int mainId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - /** - * 设置：留痕上报地点 - */ - public void setMarksLocation(String marksLocation) - { - this.marksLocation = marksLocation; - } - - /** - * 获取：留痕上报地点 - */ - public String getMarksLocation() - { - return marksLocation; - } - - - - - /** - * 设置：留痕图片 - */ - public void setMarksPicture(String marksPicture) - { - this.marksPicture = marksPicture; - } - - /** - * 获取：留痕图片 - */ - public String getMarksPicture() - { - return marksPicture; - } - - /** - * 设置：留痕视频 - */ - public void setMarksVideo(String marksVideo) - { - this.marksVideo = marksVideo; - } - - /** - * 获取：留痕视频 - */ - public String getMarksVideo() - { - return marksVideo; - } - - /** - * 设置：工程类型 - */ - public void setProjectType(String projectType) - { - this.projectType = projectType; - } - - /** - * 获取：工程类型 - */ - public String getProjectType() - { - return projectType; - } - - /** - * 设置：工序名称 - */ - public void setProcessName(String processName) - { - this.processName = processName; - } - - /** - * 获取：工序名称 - */ - public String getProcessName() - { - return processName; - } - - /** - * 设置：问题描述 - */ - public void setPositionPart(String positionPart) - { - this.positionPart = positionPart; - } - - /** - * 获取：问题描述 - */ - public String getPositionPart() - { - return positionPart; - } - - /** - * 设置：留痕说明 - */ - public void setMarksRemark(String marksRemark) - { - this.marksRemark = marksRemark; - } - - /** - * 获取：留痕说明 - */ - public String getMarksRemark() - { - return marksRemark; - } - - /** - * 设置：审核人 - */ - public void setAuditorPerson(String auditorPerson) - { - this.auditorPerson = auditorPerson; - } - - /** - * 获取：审核人 - */ - public String getAuditorPerson() - { - return auditorPerson; - } - - public String getMarksTime() { - return marksTime; - } - - public void setMarksTime(String marksTime) { - this.marksTime = marksTime; - } - - public String getCreateDate() { - return createDate; - } - - public void setCreateDate(String createDate) { - this.createDate = createDate; - } - - /** - * 设置：创建人 - */ - public void setCreateUser(String createUser) - { - this.createUser = createUser; - } - - /** - * 获取：创建人 - */ - public String getCreateUser() - { - return createUser; - } - - /** - * 设置：项目id - */ - public void setProjectId(Integer projectId) - { - this.projectId = projectId; - } - - /** - * 获取：项目id - */ - public Integer getProjectId() - { - return projectId; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getAuditorPhone() { - return auditorPhone; - } - - public void setAuditorPhone(String auditorPhone) { - this.auditorPhone = auditorPhone; - } - - public String getCheckState() { - return checkState; - } - - public void setCheckState(String checkState) { - this.checkState = checkState; - } - - public String getTypeOfProject() { - return typeOfProject; - } - - public void setTypeOfProject(String typeOfProject) { - this.typeOfProject = typeOfProject; - } - - public String getProcedure() { - return procedure; - } - - public void setProcedure(String procedure) { - this.procedure = procedure; - } - - public String getEngineeringName() { - return engineeringName; - } - - public void setEngineeringName(String engineeringName) { - this.engineeringName = engineeringName; - } - - public String getIdcardnum() { - return idcardnum; - } - - public void setIdcardnum(String idcardnum) { - this.idcardnum = idcardnum; - } - - public int getInfoType() { - return infoType; - } - - public void setInfoType(int infoType) { - this.infoType = infoType; - } - - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public int getMainId() { - return mainId; - } - - public void setMainId(int mainId) { - this.mainId = mainId; - } - - public String getSmarkUrl() { - return smarkUrl; - } - - public void setSmarkUrl(String smarkUrl) { - this.smarkUrl = smarkUrl; - } - - public Integer getNowPage() { - return nowPage; - } - - public void setNowPage(Integer nowPage) { - this.nowPage = nowPage; - } - - public Integer getSize() { - return size; - } - - public void setSize(Integer size) { - this.size = size; - } - - public int getSynchronization() { - return synchronization; - } - - public void setSynchronization(int synchronization) { - this.synchronization = synchronization; - } - - public String getBeginDate() { - return beginDate; - } - - public void setBeginDate(String beginDate) { - this.beginDate = beginDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } - - public String getPointName() { - return pointName; - } - - public void setPointName(String pointName) { - this.pointName = pointName; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - - public static long getSerialVersionUID() { - return serialVersionUID; - } - - public String getSurveyorName() { - return surveyorName; - } - - public void setSurveyorName(String surveyorName) { - this.surveyorName = surveyorName; - } - - public String getSurveyorId() { - return surveyorId; - } - - public void setSurveyorId(String surveyorId) { - this.surveyorId = surveyorId; - } - - public String getSurveyorTime() { - return surveyorTime; - } - - public void setSurveyorTime(String surveyorTime) { - this.surveyorTime = surveyorTime; - } - - public String getSurveyorContent() { - return surveyorContent; - } - - public void setSurveyorContent(String surveyorContent) { - this.surveyorContent = surveyorContent; - } - - public String getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(String updateDate) { - this.updateDate = updateDate; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksDto.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksDto.java deleted file mode 100644 index 3b62c581..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksDto.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.ruoyi.web.sspMarks.domain; - -/** - * 智能公司,随手拍留痕上报表 smz_ssp_marks - * - * @author gwb - * @date 2021-04-06 - */ -public class SspMarksDto -{ - private static final long serialVersionUID = 1L; - - /** id */ - private Integer id; - /** 留痕上报地点 */ - private String marksLocation; - /** 留痕时间 */ - private String marksTime; - /** 留痕图片 */ - private String marksPicture; - /** 留痕视频 */ - private String marksVideo; - /** 工程类型 */ - private String pointType; - /** 工序名称 */ - private String processName; - /** 问题描述 */ - private String positionPart; - /** 留痕说明 */ - private String marksRemark; - /** 审核人 */ - private String workname; - /** 审核人手机 */ - private String auditorPhone; - /** 审批状态 */ - private int checkState; - - /** 创建时间 */ - private String createDate; - /** 创建人 */ - private String createUser; - /** 所属分部门 */ - private Integer projectId; - /** 工程名称 */ - private String projectName; - - /** - * 施工人员身份证号码 - */ - private String idcardnum; - - - /** - * 工程类型 - */ - private String typeOfProject; - - /** - * 工序 - */ - private String procedure; - - /** - * 工程名称 - */ - private String engineeringName; - - /** - * 设置：id - */ - public void setId(Integer id) - { - this.id = id; - } - - /** - * 获取：id - */ - public Integer getId() - { - return id; - } - - /** - * 设置：留痕上报地点 - */ - public void setMarksLocation(String marksLocation) - { - this.marksLocation = marksLocation; - } - - /** - * 获取：留痕上报地点 - */ - public String getMarksLocation() - { - return marksLocation; - } - - - - - /** - * 设置：留痕图片 - */ - public void setMarksPicture(String marksPicture) - { - this.marksPicture = marksPicture; - } - - /** - * 获取：留痕图片 - */ - public String getMarksPicture() - { - return marksPicture; - } - - /** - * 设置：留痕视频 - */ - public void setMarksVideo(String marksVideo) - { - this.marksVideo = marksVideo; - } - - /** - * 获取：留痕视频 - */ - public String getMarksVideo() - { - return marksVideo; - } - - public String getPointType() { - return pointType; - } - - public void setPointType(String pointType) { - this.pointType = pointType; - } - - public String getWorkname() { - return workname; - } - - public void setWorkname(String workname) { - this.workname = workname; - } - - /** - * 设置：工序名称 - */ - public void setProcessName(String processName) - { - this.processName = processName; - } - - /** - * 获取：工序名称 - */ - public String getProcessName() - { - return processName; - } - - /** - * 设置：问题描述 - */ - public void setPositionPart(String positionPart) - { - this.positionPart = positionPart; - } - - /** - * 获取：问题描述 - */ - public String getPositionPart() - { - return positionPart; - } - - /** - * 设置：留痕说明 - */ - public void setMarksRemark(String marksRemark) - { - this.marksRemark = marksRemark; - } - - /** - * 获取：留痕说明 - */ - public String getMarksRemark() - { - return marksRemark; - } - - - public String getMarksTime() { - return marksTime; - } - - public void setMarksTime(String marksTime) { - this.marksTime = marksTime; - } - - public String getCreateDate() { - return createDate; - } - - public void setCreateDate(String createDate) { - this.createDate = createDate; - } - - /** - * 设置：创建人 - */ - public void setCreateUser(String createUser) - { - this.createUser = createUser; - } - - /** - * 获取：创建人 - */ - public String getCreateUser() - { - return createUser; - } - - /** - * 设置：项目id - */ - public void setProjectId(Integer projectId) - { - this.projectId = projectId; - } - - /** - * 获取：项目id - */ - public Integer getProjectId() - { - return projectId; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getAuditorPhone() { - return auditorPhone; - } - - public void setAuditorPhone(String auditorPhone) { - this.auditorPhone = auditorPhone; - } - - public int getCheckState() { - return checkState; - } - - public void setCheckState(int checkState) { - this.checkState = checkState; - } - - public String getTypeOfProject() { - return typeOfProject; - } - - public void setTypeOfProject(String typeOfProject) { - this.typeOfProject = typeOfProject; - } - - public String getProcedure() { - return procedure; - } - - public void setProcedure(String procedure) { - this.procedure = procedure; - } - - public String getEngineeringName() { - return engineeringName; - } - - public void setEngineeringName(String engineeringName) { - this.engineeringName = engineeringName; - } - - public String getIdcardnum() { - return idcardnum; - } - - public void setIdcardnum(String idcardnum) { - this.idcardnum = idcardnum; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksflow.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksflow.java deleted file mode 100644 index 69d9acfd..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksflow.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.web.sspMarks.domain; - -/** - * 留痕上报流程实体 - */ -public class SspMarksflow { - - /** id */ - private Integer id; - - /** - *流程状态(0待审，1未通过，4通过) - */ - private String checkState; - - /** - * 留痕上报id - */ - private String mainId; - - /** - * 意见 - */ - private String marksRemark; - - /** - * 创建人 - */ - private String createUser; - - /** - * 创建时间 - */ - private String createTime; - - /** - * 是否可删除 - */ - private int isDel; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getCheckState() { - return checkState; - } - - public void setCheckState(String checkState) { - this.checkState = checkState; - } - - public String getMainId() { - return mainId; - } - - public void setMainId(String mainId) { - this.mainId = mainId; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - - public int getIsDel() { - return isDel; - } - - public void setIsDel(int isDel) { - this.isDel = isDel; - } - - public String getMarksRemark() { - return marksRemark; - } - - public void setMarksRemark(String marksRemark) { - this.marksRemark = marksRemark; - } - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/mapper/SspMarksMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/mapper/SspMarksMapper.java deleted file mode 100644 index 6857cc6f..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/mapper/SspMarksMapper.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.ruoyi.web.sspMarks.mapper; - -import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo; -import com.ruoyi.web.sspMarks.domain.SspMarks; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * 随手拍留痕上报 数据层 - * - * @author gwb - * @date 2021-04-06 - */ -@Repository -public interface SspMarksMapper -{ - /** - * 查询随手拍留痕上报信息 - * - * @param id 随手拍留痕上报ID - * @return 随手拍留痕上报信息 - */ - public SspMarks selectSspMarksById(Integer id); - - /** - * 查询随手拍留痕上报列表 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 随手拍留痕上报集合 - */ - public List selectSspMarksList(SspMarks sspMarks); - - /** - * 新增随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int insertSspMarks(SspMarks sspMarks); - - /** - * 修改随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int updateSspMarks(SspMarks sspMarks); - - /** - * 删除随手拍留痕上报 - * - * @param id 随手拍留痕上报ID - * @return 结果 - */ - public int deleteSspMarksById(Integer id); - - /** - * 批量删除随手拍留痕上报 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSspMarksByIds(String[] ids); - - - int addSspMarks(SspMarks sspMarks); - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryPicture(SspMarks sspMarks); - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryVideo(SspMarks sspMarks); - - - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryPictureUrl(SspMarkfileinfo sspMarkfileinfo); - - /** - * 根据id和文件类型查询 视频 - * - * @return - */ - List queryVideoUrl(SspMarkfileinfo sspMarkfileinfo); - - /** - * 更新图片 - * - * @param map - * @return - */ - public int updatePicture(Map map); - - /** - * 更新视频 - * - * @param map - * @return - */ - public int updateVideo(Map map); - - /** - * 更新智能公司数据 - * - * @param map - * @return - */ - public int updateSmarkUrl(Map map); - - /** - * 根据审核状态查询 - * - * @param map - * @return - */ - List queryByCheckState(Map map); - - /** - * 根据id查询留痕信息 - * - * @param id - * @return - */ - SspMarks queryById(String id); - - /** - * 新增质量留痕提交记录 - * @param map - * @return - */ - int insertSspQualityMark(Map map); - - /** - * 新增质量留痕审批流 - * @param map - * @return - */ - int insertSspQualityMarkApprove(Map map); -} \ No newline at end of file diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/ISspMarksService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/ISspMarksService.java deleted file mode 100644 index 7e8f82df..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/ISspMarksService.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.ruoyi.web.sspMarks.service; - -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.web.sspMarks.domain.SspMarks; - -import java.util.List; -import java.util.Map; - -/** - * 随手拍留痕上报 服务层 - * - * @author mkl - * @date 2021-04-06 - */ -public interface ISspMarksService -{ - /** - * 查询随手拍留痕上报信息 - * - * @param id 随手拍留痕上报ID - * @return 随手拍留痕上报信息 - */ - public SspMarks selectSspMarksById(Integer id); - - /** - * 查询随手拍留痕上报列表 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 随手拍留痕上报集合 - */ - public List selectSspMarksList(SspMarks sspMarks); - - /** - * 新增随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int insertSspMarks(SspMarks sspMarks); - - /** - * 修改随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int updateSspMarks(SspMarks sspMarks); - - /** - * 保存随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - public int saveSspMarks(SspMarks sspMarks); - - - /** - * 删除随手拍留痕上报信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSspMarksByIds(String ids); - - - /** - * 新增留痕数据上报 - * - * @param sspMarks - * @return - */ - Object saveMarksAndMore(SspMarks sspMarks); - - /** - * 提交质量留痕记录 - * @param jsonObject - * @return - */ - int saveQualityMark(JSONObject jsonObject); - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryPicture(SspMarks sspMarks); - - - /** - * 根据id和文件类型查询 图片 - * - * @return - */ - List queryVideo(SspMarks sspMarks); - - - /** - * 查询留痕数据列表 - * - * @param sspMarks - * @return - */ - Map queryMarksList(SspMarks sspMarks); - - - - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/SspMarksServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/SspMarksServiceImpl.java deleted file mode 100644 index b7c33b42..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/SspMarksServiceImpl.java +++ /dev/null @@ -1,403 +0,0 @@ -package com.ruoyi.web.sspMarks.service; - -import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.web.sspManage.mapper.SspMapper; -import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo; -import com.ruoyi.web.sspMarks.domain.SspMarks; -import com.ruoyi.web.sspMarks.domain.SspMarksflow; -import com.ruoyi.web.sspMarks.mapper.SspMarksMapper; -import com.ruoyi.web.utils.MultipartFileUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.*; - - -/** - * 随手拍留痕上报 服务层实现 - * - * @author gwb - * @date 2021-04-06 - */ -@Service -public class SspMarksServiceImpl implements ISspMarksService -{ - @Autowired - private SspMarksMapper sspMarksMapper; - - @Autowired - private SspMapper sspMapper; - - - /** - * 查询随手拍留痕上报信息 - * - * @param id 随手拍留痕上报ID - * @return 随手拍留痕上报信息 - */ - @Override - public SspMarks selectSspMarksById(Integer id) - { - return sspMarksMapper.selectSspMarksById(id); - } - - /** - * 查询随手拍留痕上报列表 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 随手拍留痕上报集合 - */ - @Override - public List selectSspMarksList(SspMarks sspMarks) - { - return sspMarksMapper.selectSspMarksList(sspMarks); - } - - /** - * 新增随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - @Override - public int insertSspMarks(SspMarks sspMarks) - { - return sspMarksMapper.insertSspMarks(sspMarks); - } - - /** - * 修改随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - @Override - public int updateSspMarks(SspMarks sspMarks) - { - return sspMarksMapper.updateSspMarks(sspMarks); - } - - /** - * 保存随手拍留痕上报 - * - * @param sspMarks 随手拍留痕上报信息 - * @return 结果 - */ - @Override - public int saveSspMarks(SspMarks sspMarks) - { - String id = sspMarks.getId(); - int rows = 0; - if (StringUtils.isNotNull(id)) - { - rows = sspMarksMapper.updateSspMarks(sspMarks); - } - else - { - rows = sspMarksMapper.insertSspMarks(sspMarks); - } - return rows; - } - - /** - * 删除随手拍留痕上报对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSspMarksByIds(String ids) - { - return sspMarksMapper.deleteSspMarksByIds(Convert.toStrArray(ids)); - } - - /** - * 新增留痕数据上报 - * - * @param sspMarks - * @return - */ - @Override - public Object saveMarksAndMore(SspMarks sspMarks) { - String result = "NO"; - sspMarks.setMarksTime(sspMarks.getMarksTime() + ":00"); - String simpleUUID = IdUtil.simpleUUID(); - sspMarks.setId(simpleUUID); - //基本信息 - int m = sspMarksMapper.addSspMarks(sspMarks); - - //审批流创建, mainId取基本信息的id - SspMarksflow sspMarksflow = new SspMarksflow(); - sspMarksflow.setMainId(sspMarks.getId()); - sspMarksflow.setCheckState(sspMarks.getCheckState()); - sspMarksflow.setMarksRemark(sspMarks.getMarksRemark()); - sspMarksflow.setCreateTime(sspMarks.getCreateDate()); - sspMarksflow.setCreateUser(sspMarks.getCreateUser()); - - int b = sspMapper.saveSspMarkFlow(sspMarksflow); - //图片 - int c = 0; - JSONArray JSONArray = com.alibaba.fastjson.JSONArray.parseArray(sspMarks.getMarksPicture()); - - for (int i = 0; i < JSONArray.size(); i++) { - String name = "sspImg-"+ UUID.randomUUID()+".jpg"; - String objImg64 = JSONArray.get(i).toString(); - String imgBase64One = objImg64.substring(0, objImg64.indexOf(",")); - String imgBase64 = objImg64.substring(imgBase64One.length()+1, objImg64.length()); - SspMarkfileinfo sspMarkfileinfo = new SspMarkfileinfo(); - Map imgMap = null; - try { - MultipartFile file = MultipartFileUtils.base64ToMultipartFile(objImg64); - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - sspMarkfileinfo.setFileUrl(fileName); - } catch (Exception e) { - e.printStackTrace(); - } - sspMarkfileinfo.setFileType(0); - sspMarkfileinfo.setCreateUser(sspMarks.getCreateUser()); - sspMarkfileinfo.setExternalId(sspMarksflow.getId()); - c = sspMapper.saveMarkFileInfo(sspMarkfileinfo); - } - //视频 - if(org.apache.commons.lang3.StringUtils.isNotBlank(sspMarks.getMarksVideo())) { - SspMarkfileinfo sspMarkfileinfo = new SspMarkfileinfo(); - sspMarkfileinfo.setFileUrl(sspMarks.getMarksVideo()); - sspMarkfileinfo.setFileType(1); - sspMarkfileinfo.setCreateUser(sspMarks.getCreateUser()); - sspMarkfileinfo.setExternalId(sspMarksflow.getId()); - sspMapper.saveMarkFileInfo(sspMarkfileinfo); - } - - /** - * 更新图片、视频url - */ - SspMarkfileinfo sspMarkfileinfo = new SspMarkfileinfo(); - sspMarkfileinfo.setExternalId(sspMarksflow.getId()); - String picture = ""; - List sspMarkfileinfoList = sspMarksMapper.queryPictureUrl(sspMarkfileinfo); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < sspMarkfileinfoList.size(); i++) { - sb.append(sspMarkfileinfoList.get(i).getFileUrl()).append(","); - } - picture = sb.toString().substring(0,sb.toString().length()-1); - Map parmsMap = new HashMap<>(); - parmsMap.put("smarkUrl", picture); - parmsMap.put("id", sspMarks.getId()); - sspMarksMapper.updateSmarkUrl(parmsMap); - - parmsMap.put("picture", sspMarkfileinfoList.get(0).getFileUrl()); - //展示一张图片 - sspMarksMapper.updatePicture(parmsMap); - - - List vidceoSspMark = sspMarksMapper.queryVideoUrl(sspMarkfileinfo); - parmsMap.put("video", vidceoSspMark == null || vidceoSspMark.size() == 0?"":vidceoSspMark.get(0).getFileUrl()); - sspMarksMapper.updateVideo(parmsMap); - if( m > 0 && b> 0 && c > 0) { - result = "OK"; - } - return result; - } - - @Override - public int saveQualityMark(JSONObject jsonObject) { - Map map = new HashMap<>(); - map.put("projectId",jsonObject.containsKey("projectId")?jsonObject.getString("projectId"):""); - map.put("workTime",jsonObject.containsKey("workTime")?jsonObject.getString("workTime"):""); - map.put("positionId",jsonObject.containsKey("projectGhId")?jsonObject.getString("projectGhId"):""); - map.put("paragrapId",jsonObject.containsKey("projectPlaceId")?jsonObject.getString("projectPlaceId"):""); - map.put("locationId",jsonObject.containsKey("projectLocationId")?jsonObject.getString("projectLocationId"):""); - map.put("conclusion",jsonObject.containsKey("conclusion")?jsonObject.getString("conclusion"):""); - map.put("szUser",jsonObject.containsKey("SZUser")?jsonObject.getString("SZUser"):""); - map.put("zjUserId",jsonObject.containsKey("ZJUserId")?jsonObject.getString("ZJUserId"):""); - map.put("zbUserId",jsonObject.containsKey("ZBUserId")?jsonObject.getString("ZBUserId"):""); - map.put("jlUserId",jsonObject.containsKey("JLUserId")?jsonObject.getString("JLUserId"):""); - map.put("createUser",jsonObject.containsKey("create_user")?jsonObject.getString("create_user"):""); - String beforeImgs = ""; - String afterImgs = ""; - if(jsonObject.containsKey("beforeImgSrcList")){ - JSONArray jsonArray = jsonObject.getJSONArray("beforeImgSrcList"); - if(jsonArray.size() > 0){ - for(int i = 0;i 0){ - for(int i = 0;i sp = new HashMap<>(); - sp.put("markId",mark_id); - //总包审核人 - if(jsonObject.containsKey("ZBUserId")){ - sp.put("userId",jsonObject.getString("ZBUserId")); - sp.put("userName",jsonObject.getString("ZBUserName")); - sp.put("loginName",jsonObject.getString("ZBUserPhone")); - sp.put("sort",1); - sspMarksMapper.insertSspQualityMarkApprove(sp); - } - if(jsonObject.containsKey("JLUserId")){ - sp.put("userId",jsonObject.getString("JLUserId")); - sp.put("userName",jsonObject.getString("JLUserName")); - sp.put("loginName",jsonObject.getString("JLUserPhone")); - sp.put("sort",2); - sspMarksMapper.insertSspQualityMarkApprove(sp); - } - } - return i; - } - - /** - * 根据流程表id 和文件类型查询图片 - * - * @param sspMarks - * @return - */ - @Override - public List queryPicture(SspMarks sspMarks) { - - return sspMarksMapper.queryPicture(sspMarks); - } - - /** - * 视频 - * - * @param sspMarks - * @return - */ - @Override - public List queryVideo(SspMarks sspMarks) { - return sspMarksMapper.queryVideo(sspMarks); - } - - /** - * 查询留痕上报列表 - * - * @param sspMarks - * @return - */ - @Override - public Map queryMarksList(SspMarks sspMarks) { - Map returnMap = new HashMap<>(); - String projectName = ""; - List publishMarks = new ArrayList<>(); - List publishMarksMy = new ArrayList<>(); - //审核通过 - if("4".equals(sspMarks.getCheckState())) { - publishMarks = sspMarksMapper.selectSspMarksList(sspMarks); - for(SspMarks dbSspMarks:publishMarks){ - projectName = dbSspMarks.getMarksLocation(); - } - } else if("".equals(sspMarks.getCheckState()) ) { - - /*** - * 初始化页面 - */ - sspMarks.setCheckState("4"); - publishMarks = sspMarksMapper.selectSspMarksList(sspMarks); - for(SspMarks dbSspMarks:publishMarks){ - projectName = dbSspMarks.getMarksLocation(); - } - - Map noPassMap = new HashMap<>(); - noPassMap.put("checkState", "1"); - noPassMap.put("projectId", sspMarks.getProjectId()); - - Map daiPassMap = new HashMap<>(); - daiPassMap.put("checkState", "0"); - daiPassMap.put("projectId", sspMarks.getProjectId()); - //没通过 - List noPass = sspMarksMapper.queryByCheckState(noPassMap); - for(SspMarks npSspMarks:noPass) { - publishMarksMy.add(npSspMarks); - } - //待通过 - List daiPass = sspMarksMapper.queryByCheckState(daiPassMap); - for(SspMarks daiPassSmark:daiPass) { - publishMarksMy.add(daiPassSmark); - } - - } else if("-1".equals(sspMarks.getCheckState())) { - - /** - * 搜索 - * - */ - //未通过 - Map noPassMap = new HashMap<>(); - noPassMap.put("checkState", "1"); - noPassMap.put("positionPart", sspMarks.getPositionPart()); - noPassMap.put("projectId", sspMarks.getProjectId()); - - - Map daiPassMap = new HashMap<>(); - daiPassMap.put("checkState", "0"); - daiPassMap.put("positionPart", sspMarks.getPositionPart()); - daiPassMap.put("projectId", sspMarks.getProjectId()); - - //没通过 - List noPass = sspMarksMapper.queryByCheckState(noPassMap); - for(SspMarks npSspMarks:noPass) { - publishMarksMy.add(npSspMarks); - } - //待通过 - List daiPass = sspMarksMapper.queryByCheckState(daiPassMap); - for(SspMarks daiPassSmark:daiPass) { - publishMarksMy.add(daiPassSmark); - } - //获取项目名称 - for(SspMarks dbSspMarks:publishMarksMy){ - projectName = dbSspMarks.getMarksLocation(); - } - } else { - if("0".equals(sspMarks.getCheckState()) || "1".equals(sspMarks.getCheckState())) { - //待审核,审核通过 - publishMarksMy = sspMarksMapper.selectSspMarksList(sspMarks); - for(SspMarks dbPublishMarksMy:publishMarksMy){ - projectName = dbPublishMarksMy.getMarksLocation(); - } - } - } - - //项目地点 - returnMap.put("projectName", projectName); - //发布列表 - returnMap.put("publishMarks", publishMarks); - //发布列表数量 - returnMap.put("publishMarksSize", publishMarks.size()); - - //我的发布列表 - returnMap.put("publishMarksMy", publishMarksMy); - //我的发布列表数量 - returnMap.put("publishMarksMySize", publishMarksMy.size()); - return returnMap; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java similarity index 61% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java index a5b4dbf3..916dc08b 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WechatUserLoginController.java @@ -1,16 +1,17 @@ -package com.ruoyi.web.system.controller; +package com.ruoyi.web.userLogin.controller; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.framework.web.service.TokenService; -import com.ruoyi.web.system.service.IWechatUserLoginService; +import com.ruoyi.web.userLogin.service.IWechatUserLoginService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Map; + /** * @version : V1.0 * @ClassName: LoginController @@ -60,16 +61,14 @@ public class WechatUserLoginController extends BaseController { public AjaxResult openIdLogin(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); - LoginUser loginUser = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId()); - if(loginUser!=null){ - // 生成令牌 - String token = tokenService.createToken(loginUser); - ajax.put(Constants.TOKEN, token); - ajax.put("data",wechatUserLoginService.findUserInfo(loginUser.getUsername(),loginBody.getOpenId())); - }else{ + ajax.put(Constants.TOKEN, ""); + Map data = wechatUserLoginService.getLoginUserByOpenId(loginBody.getOpenId()); + if(data!=null){ + ajax.put("data",data); + return ajax; + }else { return error(); } - return ajax; } /** @@ -79,8 +78,8 @@ public class WechatUserLoginController extends BaseController { * @return */ @GetMapping("/getOpenId") - public Object getOpenId(String code,String appId){ - return wechatUserLoginService.getOpenId(code,appId); + public AjaxResult getOpenId(String code,String appId){ + return success(wechatUserLoginService.getOpenId(code,appId)); } /** @@ -89,8 +88,30 @@ public class WechatUserLoginController extends BaseController { * @return */ @GetMapping("/selectRoleMenuList") - public Object selectRoleMenuList(String username){ - return wechatUserLoginService.selectRoleMenuList(username); + public AjaxResult selectRoleMenuList(String username){ + return success(wechatUserLoginService.selectRoleMenuList(username)); + } + + /** + * 查询登录用户的组织架构 + * @param map + * @return + */ + @RequestMapping("/selectDeptAll") + public AjaxResult selectDeptAll(@RequestParam Map map){ + return success(wechatUserLoginService.getDeptAll(map)); + } + + /** + * @Description: 修改密码 + * @Param: [map] + * @return: java.lang.Object + * @Author: wxw + * @Date: 2020/7/7 19:15 + */ + @RequestMapping(value = "updatePassword",method = RequestMethod.POST) + public Object updatePassword(@RequestParam Map map){ + return wechatUserLoginService.updataUser(map); } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WxUserLoginController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WxUserLoginController.java deleted file mode 100644 index 2f5b0b8d..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WxUserLoginController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.web.userLogin.controller; - -import com.ruoyi.web.userLogin.service.WxUserLoginService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.servlet.http.HttpSession; -import java.util.Map; - -/** - * 微信小程序登录 - */ -@Controller -@RequestMapping("/weixin/userLogin/") -public class WxUserLoginController { - @Autowired - private WxUserLoginService service; - - /** - * @Description: 验证登录密码账号 - * @Param: [map] - * @return: java.lang.Object - * @Author: wxw - */ - @RequestMapping(value = "checkPassWord",method = RequestMethod.GET) - @ResponseBody - public Object checkPassWord(String username, String password,String openId, HttpSession session){ - return service.checkLogoin(username,password,openId,session); - } - - /** - * @Description: 修改密码 - * @Param: [map] - * @return: java.lang.Object - * @Author: wxw - * @Date: 2020/7/7 19:15 - */ - @RequestMapping(value = "updatePassword",method = RequestMethod.POST) - @ResponseBody - public Object updatePassword(@RequestParam Map map){ - return service.updataUser(map); - } - - /** - * 添加用户openid - * @param map - * @return - */ - @RequestMapping(value = "saveUserOpenId",method = RequestMethod.POST) - @ResponseBody - public Object saveUserOpenId(@RequestParam Map map){ - return service.addUserOpenId(map); - } - - /** - * 根据openid查询数据 - * @param openId - * @return - */ - @RequestMapping(value = "selectUserInfoByOpenId",method = RequestMethod.GET) - @ResponseBody - public Object selectUserInfoByOpenId(String openId, HttpSession session){ - return service.getUserInfoByOpenId(openId,session); - } - - /** - * 验证手机号码是否已经绑定 - * @param phone - * @return - */ - @RequestMapping(value = "checkBindByPhone",method = RequestMethod.GET) - @ResponseBody - public Object checkBindByPhone(String phone){ - return service.checkBindByPhone(phone); - } - - /** - * 查询出更多功能菜单信息 - * @return - */ - @RequestMapping("selectMenuList") - @ResponseBody - public Object selectMenuList(){ - return service.selectMenuList(); - } - - /** - * 查询出openid - * @param code - * @param appId - * @return - */ - @RequestMapping("/getOpenId") - @ResponseBody - public Object getOpenId(String code,String appId){ - return service.getOpenId(code,appId); - } - - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java similarity index 90% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java index 98b60b41..9e16b242 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WechatUserLoginMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.system.mapper; +package com.ruoyi.web.userLogin.mapper; import java.util.List; import java.util.Map; @@ -19,6 +19,13 @@ public interface WechatUserLoginMapper { */ public Map findUserInfo(String loginName); + /** + * 修改密码 + * @param map + * @return + */ + int updataUser(Map map); + /** * 添加用户openid信息 * @param map diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WxUserLoginMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WxUserLoginMapper.java deleted file mode 100644 index aa8dfe84..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WxUserLoginMapper.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ruoyi.web.userLogin.mapper; - -import java.util.List; -import java.util.Map; - -public interface WxUserLoginMapper { - /** - * 验证登录用户信息 - * @param map - * @return - */ - Map checkLoginNameAndPsw(Map map); - - /** - * 修改密码 - * @param map - * @return - */ - int updataUser(Map map); - - /** - * 添加用户openid信息 - * @param map - * @return - */ - int addUserOpenId(Map map); - - /** - * 更新用户openid - * @param map - * @return - */ - int updateUserOpenId(Map map); - - /** - * 根据电话查询用户id - * @param phone - * @return - */ - String getUserIdByPhone(String phone); - - /** - * 根据用户openid查询用户信息 - * @param openId - * @return - */ - Map getUserInfoByOpenId(String openId); - - /** - * 验证手机号码是否已经绑定 - * @param phone - * @return - */ - int checkBindByPhone(String phone); - - /** - * 验证手机号码是否已经绑定 - * @param openId - * @return - */ - int checkBindByOpenId(String openId); - - /** - * 查询出系统菜单 - * @return - */ - List> selectMenuList(); - -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java similarity index 67% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java index 5f5aca19..0cc6e086 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/IWechatUserLoginService.java @@ -1,6 +1,4 @@ -package com.ruoyi.web.system.service; - -import com.ruoyi.common.core.domain.model.LoginUser; +package com.ruoyi.web.userLogin.service; import java.util.List; import java.util.Map; @@ -21,6 +19,13 @@ public interface IWechatUserLoginService { */ public Map findUserInfo(String loginName,String openId); + /** + * 修改密码 + * @param map + * @return + */ + public Map updataUser(Map map); + /** * 获取openId * @param code @@ -34,7 +39,7 @@ public interface IWechatUserLoginService { * @param openId * @return */ - public LoginUser getLoginUserByOpenId(String openId); + public Map getLoginUserByOpenId(String openId); /** * 根据用户查询菜单信息 @@ -42,4 +47,11 @@ public interface IWechatUserLoginService { * @return */ public List> selectRoleMenuList(String username); + + /** + * 查询用户的组织架构 + * @param map + * @return + */ + Map getDeptAll(Map map); } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginService.java deleted file mode 100644 index abcf6c83..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginService.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.ruoyi.web.userLogin.service; - -import javax.servlet.http.HttpSession; -import java.util.Map; - -public interface WxUserLoginService { - - /** - * 验证用户登录 - * @param loginName - * @param password - * @param session - * @return - */ - Map checkLogoin(String loginName,String password,String openId, HttpSession session); - - /** - * 修改密码 - * @param map - * @return - */ - Map updataUser(Map map); - - /** - * 添加用户openid信息 - * @param map - * @return - */ - Map addUserOpenId(Map map); - - /** - * 根据用户openid查询用户信息 - * @param openId - * @return - */ - Map getUserInfoByOpenId(String openId, HttpSession session); - - /** - * 验证手机号码是否已经绑定 - * @param phone - * @return - */ - Map checkBindByPhone(String phone); - - /** - * 查询出系统菜单 - * @return - */ - Map selectMenuList(); - - /** - * 获取openId - * @param code - * @return - */ - Map getOpenId(String code,String appId); -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginServiceImpl.java deleted file mode 100644 index aac4cff8..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginServiceImpl.java +++ /dev/null @@ -1,303 +0,0 @@ -package com.ruoyi.web.userLogin.service; - -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DeptTypeEnum; -import com.ruoyi.common.enums.SysRoleEnum; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.web.projectInfo.mapper.WxProjectInfoMapper; -import com.ruoyi.web.userLogin.mapper.WxUserLoginMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpSession; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Service -public class WxUserLoginServiceImpl implements WxUserLoginService{ - private static MapappInfo = new HashMap<>(); - static { - //智慧工地优管 - appInfo.put("wx23d12da8a7e50906","8438a009f433fb7fc8e8d4681d24d718"); - //产发数字系统 - appInfo.put("wxc44b5d588f599758","b4da7402397f559395db7c1b0534c369"); - } - - @Autowired - private ISysConfigService configService; - - @Autowired - private SysUserMapper sysUserMapper; - - @Autowired - private WxUserLoginMapper mapper; - - @Autowired - private SysDeptMapper sysDeptMapper; - - @Autowired - private SysRoleMapper sysRoleMapper; - - @Autowired - private WxProjectInfoMapper ProjectInfoMapper; - - @Override - public Map checkLogoin(String loginName, String password,String openId, HttpSession session) { - Map stateMap = new HashMap<>(); - Map map = new HashMap<>(); - map.put("loginName",loginName); - // 用户名不在指定范围内 错误 - if (loginName.length() != UserConstants.PHONE_LENGTH) - { - stateMap.put("data","300"); - stateMap.put("info","账号错误，请您重新输入"); - } - // 密码如果不在指定范围内 错误 - if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { - stateMap.put("data","300"); - stateMap.put("info","密码错误，请您重新输入"); - } - // IP黑名单校验 - String blackStr = configService.selectConfigByKey("sys.login.blackIPList"); - if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) - { - stateMap.put("data","300"); - stateMap.put("info","当前登录IP未在白名单，请您联系系统供应商"); - } - Map userMap = mapper.checkLoginNameAndPsw(map); - if(userMap == null){ - stateMap.put("data","300"); - stateMap.put("info","账号不存在，请您重新输入"); - }else { - if(!SecurityUtils.matchesPassword(password,userMap.get("password").toString())){ - stateMap.put("data","300"); - stateMap.put("info","密码错误，请您重新输入"); - }else { - Map userInfo = new HashMap<>(); - userInfo.put("loginName",loginName); - userInfo.put("userName",userMap.get("user_name")); - userInfo.put("nickName",userMap.get("nick_name")); - userInfo.put("deptName",userMap.get("dept_name")); - userInfo.put("deptId",userMap.get("dept_id")); - userInfo.put("userId",userMap.get("user_id")); - userInfo.put("remark",userMap.containsKey("remark")?userMap.get("remark"):""); - userInfo.put("roleId",userMap.get("roleId")); - userInfo.put("roleName",userMap.get("roleName")); - //存数据到session - session.setAttribute("userInfo",userInfo); - //设置缓存时间为一天 - session.setMaxInactiveInterval(60*60*24); - /** 查询当前用户项目信息 **/ - //当前登录账号角色信息 - String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(userMap.get("user_id")))); - if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ - Long deptId = this.getZgsDept(Convert.toLong(userMap.get("dept_id"))).getDeptId(); - map.put("nowDeptId",Convert.toStr(deptId)); - }else{ - map.put("nowDeptId",Convert.toStr(userMap.get("dept_id"))); - } - //当前角色时管理员时，修改角色为集团公司 - if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){ - nowRole = SysRoleEnum.JTGS.getCode(); - } - map.put("nowRole",nowRole); - List> projectList = ProjectInfoMapper.getProjectByDeptIdAndCompanyId(map); - stateMap.put("data","200"); - stateMap.put("info","登录成功"); - stateMap.put("userinfo",userInfo); - //只有一个项目时直接保存项目信息 - if(projectList!=null && projectList.size()==1){ - Map projectInfo = new HashMap<>(); - projectInfo.put("projectId",projectList.get(0).get("projectId")); - projectInfo.put("projectName",projectList.get(0).get("projectName")); - projectInfo.put("projectInfoList",projectList); - projectInfo.put("shengName","西安市"); - projectInfo.put("shiName","西咸新区"); - projectInfo.put("quName","泾河新城"); - projectInfo.put("logCompanyName",userMap.get("dept_name")); - stateMap.put("projectInfo",projectInfo); - } - //存储用户openid - map.put("userId", Convert.toStr(userMap.get("user_id"))); - map.put("nickname",userMap.get("nick_name")); - map.put("openId",openId); - //验证手机号码是否绑定 - int count = mapper.checkBindByOpenId(openId); - if(count > 0){ - mapper.updateUserOpenId(map); - }else { - mapper.addUserOpenId(map); - } - } - } - return stateMap; - } - - @Override - public Map updataUser(Map map) { - Map infoMap = new HashMap<>(); - String oldPws = Convert.toStr(map.get("oldPsw")); - SysUser sysUser = sysUserMapper.selectUserByUserName(Convert.toStr(map.get("loginName"))); - if(!SecurityUtils.matchesPassword(oldPws,sysUser.getPassword())) { - infoMap.put("data","-1"); - infoMap.put("info","旧密码错误，请重新输入！"); - return infoMap; - } - if(!Convert.toStr(map.get("newPsw")).equals(Convert.toStr(map.get("password")))){ - infoMap.put("data","-2"); - infoMap.put("info","两次密码不一致，请重新输入！"); - return infoMap; - } - map.put("password",SecurityUtils.encryptPassword(Convert.toStr(map.get("password")))); - if(mapper.updataUser(map) > 0){ - infoMap.put("data","200"); - infoMap.put("info","操作成功"); - }else { - infoMap.put("data","-3"); - infoMap.put("info","操作失败！"); - } - return infoMap; - } - - @Override - public Map addUserOpenId(Map map) { - Map dataMap = new HashMap<>(16); - String userId =mapper.getUserIdByPhone(map.get("loginName").toString()); - if(StringUtils.isNotBlank(userId)){ - map.put("userId",userId); - if(mapper.addUserOpenId(map)>0){ - dataMap.put("code","200"); - dataMap.put("msg","添加成功"); - }else { - dataMap.put("code","300"); - dataMap.put("msg","添加失败"); - } - }else { - dataMap.put("code","300"); - dataMap.put("msg","添加失败,userId为空"); - } - return dataMap; - } - - @Override - public Map getUserInfoByOpenId(String openId, HttpSession session) { - Map map = new HashMap<>(16); - Map dataMap = mapper.getUserInfoByOpenId(openId); - if(dataMap != null){ - map.put("code","200"); - map.put("userinfo",dataMap); - map.put("info","登录成功"); - //存数据到session - session.setAttribute("userInfo",dataMap); - //设置缓存时间为一天 - session.setMaxInactiveInterval(60*60*24); - - /** 查询当前用户项目信息 **/ - Map searchMap = new HashMap<>(16); - //当前登录账号角色信息 - String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(dataMap.get("userId")))); - if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ - Long deptId = this.getZgsDept(Convert.toLong(dataMap.get("deptId"))).getDeptId(); - searchMap.put("nowDeptId",Convert.toStr(deptId)); - }else{ - searchMap.put("nowDeptId",Convert.toStr(dataMap.get("deptId"))); - } - //当前角色时管理员时，修改角色为集团公司 - if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){ - nowRole = SysRoleEnum.JTGS.getCode(); - } - searchMap.put("nowRole",nowRole); - searchMap.put("userId",dataMap.get("userId")); - List> projectList = ProjectInfoMapper.getProjectByDeptIdAndCompanyId(searchMap); - //只有一个项目时直接保存项目信息 - if(projectList!=null && projectList.size()==1){ - Map projectInfo = new HashMap<>(); - projectInfo.put("projectId",projectList.get(0).get("projectId")); - projectInfo.put("projectName",projectList.get(0).get("projectName")); - projectInfo.put("projectInfoList",projectList); - projectInfo.put("shengName","西安市"); - projectInfo.put("shiName","西咸新区"); - projectInfo.put("quName","泾河新城"); - projectInfo.put("logCompanyName",dataMap.get("deptName")); - map.put("projectInfo",projectInfo); - } - }else { - map.put("code","300"); - map.put("msg","暂无数据"); - } - return map; - } - - @Override - public Map checkBindByPhone(String phone) { - Map map = new HashMap<>(16); - int count = mapper.checkBindByPhone(phone); - if(count >0){ - map.put("code","300"); - map.put("msg","该号码已绑定,请重新输入！"); - }else { - map.put("code","200"); - map.put("msg","验证成功"); - } - return map; - } - - @Override - public Map selectMenuList() { - Map map = new HashMap<>(16); - List> list = mapper.selectMenuList(); - if(list != null && list.size() > 0){ - map.put("code","200"); - map.put("data",list); - map.put("msg","查询成功"); - }else { - map.put("code","300"); - map.put("msg","查询失败"); - } - return map; - } - - /** - * 查询子公司部门ID - * - * @param deptId 部门ID - * @return 结果 - */ - private SysDept getZgsDept(Long deptId){ - SysDept sysDept = sysDeptMapper.selectDeptById(deptId); - if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ - //comFlag标识为1是子公司 - if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){ - return sysDept; - }else{ - return getZgsDept(sysDept.getParentId()); - } - }else{ - return sysDept; - } - } - - @Override - public Map getOpenId(String code, String appId) { - String url = "https://api.weixin.qq.com/sns/jscode2session?appid="+appId+"&secret="+appInfo.get(appId)+"&js_code="+code+"&grant_type=authorization_code"; - String resultStr = HttpUtil.get(url); - JSONObject json = JSONObject.parseObject(resultStr); - //删除参数session_key，否则小程序检测关键参数暴露，提示整改 - json.remove("session_key"); - return json; - } -} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java similarity index 54% rename from ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java rename to ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java index 468fce97..e70f5e68 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java @@ -1,23 +1,27 @@ -package com.ruoyi.web.system.service.impl; +package com.ruoyi.web.userLogin.service.impl; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.DeptTypeEnum; import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.web.service.SysPermissionService; import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.mapper.SysRoleMapper; +import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.web.system.mapper.WechatUserLoginMapper; -import com.ruoyi.web.system.service.IWechatUserLoginService; +import com.ruoyi.web.project.mapper.WxProjectInfoMapper; +import com.ruoyi.web.userLogin.mapper.WechatUserLoginMapper; +import com.ruoyi.web.userLogin.service.IWechatUserLoginService; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.mapper.SurProjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -54,6 +58,15 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService { @Autowired private WechatUserLoginMapper wechatUserLoginMapper; + @Autowired + private WxProjectInfoMapper ProjectInfoMapper; + + @Autowired + private SysRoleMapper sysRoleMapper; + + @Autowired + private SysUserMapper sysUserMapper; + /** * 获取用户信息 * @param loginName @@ -73,6 +86,7 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService { userInfo.put("remark",userData.containsKey("remark")?userData.get("remark"):""); userInfo.put("roleId",userData.get("roleId")); userInfo.put("roleName",userData.get("roleName")); + userInfo.put("minRoleId",userData.get("minRoleId")); /** 查询当前用户项目信息 **/ SurProject surProject = new SurProject(); @@ -124,13 +138,14 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService { * @param openId * @return */ - public LoginUser getLoginUserByOpenId(String openId) { + public Map getLoginUserByOpenId(String openId) { Map userMap = wechatUserLoginMapper.getUserNameByOpenId(openId); if(userMap!=null){ - SysUser user = userService.selectUserByUserName(Convert.toStr(userMap.get("loginName"))); - return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); + return this.findUserInfo(userMap.get("loginName").toString(),openId); + }else{ + return null; } - return null; + } /** @@ -173,4 +188,93 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService { return wechatUserLoginMapper.selectRoleMenuList(username); } + @Override + public Map getDeptAll(Map map) { + //当前登录账号角色信息 + String nowRole = null; + if(map.get("minRoleId")!=null && !"undefined".equals(map.get("minRoleId"))){ + nowRole = map.get("minRoleId").toString(); + }else{ + nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId")))); + } + + Map dataMap = new HashMap<>(16); + //组装数据 + dataMap.put("shengName","西安市"); + dataMap.put("shiName","西咸新区"); + dataMap.put("quName","泾河新城"); + //公司信息 + List> list = new ArrayList<>(); + Map totalMap = new HashMap<>(16); + //查询出公司信息 + if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) ){ + List> companyList = ProjectInfoMapper.getZGSDeptInfoByMap(map); + totalMap.put("id","0"); + totalMap.put("text","泾河产业发展集团"); + list.add(totalMap); + for(Map companyMap:companyList){ + totalMap = new HashMap<>(16); + totalMap.put("id",companyMap.get("dept_id")); + totalMap.put("text",companyMap.get("dept_name")); + list.add(totalMap); + } + }else if(SysRoleEnum.ZGS.getCode().equals(nowRole)){ + SysDept sysDept = this.getZgsDept(Convert.toLong(map.get("deptId"))); + totalMap.put("id",sysDept.getDeptId()); + totalMap.put("text",sysDept.getDeptName()); + list.add(totalMap); + }else if(SysRoleEnum.COMMON.getCode().equals(nowRole)){ + //普通角色，获取真实部门 + SysDept sysDept = this.getZgsDept(Convert.toLong(map.get("deptId"))); + //判断当前部门是否是产业发展集团 + if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag()) || DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ + sysDept = this.getZgsDept(Convert.toLong(sysDept.getDeptId())); + totalMap.put("id",sysDept.getDeptId()); + totalMap.put("text",sysDept.getDeptName()); + list.add(totalMap); + }else{ + //普通角色 + totalMap.put("id",sysDept.getDeptId()); + totalMap.put("text",sysDept.getDeptName()); + list.add(totalMap); + } + }else{ + //监理单位/总包单位/分包单位 + SysDept sysDept = sysDeptMapper.selectDeptById(Convert.toLong(map.get("deptId"))); + totalMap.put("id",sysDept.getDeptId()); + totalMap.put("text",sysDept.getDeptName()); + list.add(totalMap); + } + dataMap.put("province_list",list); + dataMap.put("deptId",map.get("deptId")); + dataMap.put("logCompanyName",list.get(0).get("text")); + dataMap.put("companyId",list.get(0).get("text")); + return dataMap; + } + + @Override + public Map updataUser(Map map) { + Map infoMap = new HashMap<>(); + String oldPws = Convert.toStr(map.get("oldPsw")); + SysUser sysUser = sysUserMapper.selectUserByUserName(Convert.toStr(map.get("loginName"))); + if(!SecurityUtils.matchesPassword(oldPws,sysUser.getPassword())) { + infoMap.put("data","-1"); + infoMap.put("info","旧密码错误，请重新输入！"); + return infoMap; + } + if(!Convert.toStr(map.get("newPsw")).equals(Convert.toStr(map.get("password")))){ + infoMap.put("data","-2"); + infoMap.put("info","两次密码不一致，请重新输入！"); + return infoMap; + } + map.put("password",SecurityUtils.encryptPassword(Convert.toStr(map.get("password")))); + if(wechatUserLoginMapper.updataUser(map) > 0){ + infoMap.put("data","200"); + infoMap.put("info","操作成功"); + }else { + infoMap.put("data","-3"); + infoMap.put("info","操作失败！"); + } + return infoMap; + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/utils/MultipartFileUtils.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/utils/MultipartFileUtils.java deleted file mode 100644 index 00a44abd..00000000 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/utils/MultipartFileUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.web.utils; - -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.Base64; - -/** - * JiangYuQi - */ -public class MultipartFileUtils { - - public static MultipartFile base64ToMultipartFile(String base64) throws IOException { - String[] parts = base64.split(","); - String contentType = parts[0].split(";")[0].split(":")[1]; - byte[] bytes = Base64.getDecoder().decode(parts[1]); - return new MockMultipartFile("file", "file", contentType, bytes); - } - -} diff --git a/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml b/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml index 29f8a061..cee3bcc8 100644 --- a/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml +++ b/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml @@ -2,19 +2,7 @@ - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into china_area - ( - areaName, - provinceId, - provinceName, - cityId, - cityName, - adcode, - lat, - lng - )values - - ( - #{item.areaName}, - #{item.provinceId}, - #{item.provinceName}, - #{item.cityId}, - #{item.cityName}, - #{item.adcode}, - #{item.lat}, - #{item.lng} - ) - - - - - - - - - - - - - - - - - - - - SELECT - ssp.id, - ssp.projectId, - spi.projectName, - ssp.problemArea, - ssp.workParts, - ssp.changeInfo, - ssp.checkState, - date_format(ssp.createTime,'%Y-%m-%d %H:%i') AS createTime, - ssf.fileUrl, - ssp.lordSent, - ssp.lordSentUser, - ssp.copySend, - ssp.copySendUser, - ssp.marks_picture as marksPicture, - ssp.marks_video as marksVideo, - ssp.smark_url as smarkUrl, - (case when ssp.lordSentUser = #{loginName} then 1 else 0 end) sort, - case when ud.type_flag in (1,11) then sd.dept_name else ud.dept_name end as deptName - FROM - smz_ssp_problemmodify ssp - LEFT JOIN smz_ssp_auditinfo ssa ON ssp.id = ssa.mainId and (ssa.processState='0' or ssa.processState ='1') - LEFT JOIN smz_ssp_fileinfo ssf ON ssa.id = ssf.auditId - LEFT JOIN sur_project spi ON ssp.projectId = spi.id - LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber - left join sys_dept ud on ud.dept_id = su.dept_id - left join sys_dept sd on sd.dept_id = spi.deptId - WHERE - ssp.projectId = #{projectId} - AND ssp.infoType = 0 - and ssp.isDel=0 - AND ssp.workParts LIKE CONCAT('%',#{searchText},'%') - AND Date(ssp.createTime) >= #{startTime} - AND #{endTime} >= Date(ssp.createTime) - AND ssp.infoType = #{infoType} - AND ssp.checkState = #{checkState} - AND (FIND_IN_SET(#{loginName}, ssp.copySendUser) OR FIND_IN_SET(#{loginName}, ssp.lordSentUser) OR FIND_IN_SET(#{loginName}, ssp.recheckSendUser)) - GROUP BY ssp.id - ORDER BY sort DESC,createTime DESC - - - - - - - - - - - - - - INSERT INTO - smz_ssp_problemmodify - ( projectId, - infoType, - problemArea, - workParts, - changeInfo, - lordSent, - lordSentUser, - copySend, - copySendUser, - checkState, - nickedTime, - danger_type, - recheckSend, - recheckSendUser, - roleType, - isDel, - createUser, - createTime ) - VALUES - ( - #{projectId}, - 0, - #{problemArea}, - #{workParts}, - #{changeInfo}, - #{lordSent}, - #{lordSentUser}, - #{copySend}, - #{copySendUser}, - 0, - #{nickedTime}, - #{dangerType}, - #{recheckSend}, - #{recheckSendUser}, - #{roleType}, - 0, - #{createUser}, - NOW() - ); - - - - INSERT INTO - smz_ssp_problemmodify - ( projectId, - infoType, - workParts, - nickedArea, - nickedTime, - projectType, - processName, - projectName, - nickedInfo, - checkUser, - checkUserPhone, - checkState, - danger_type, - recheckSend, - recheckSendUser, - isDel, - createUser, - createTime ) - VALUES - ( - #{projectId}, - 0, - #{workParts}, - #{nickedArea}, - #{nickedTime}, - #{projectType}, - #{processName}, - #{projectName}, - #{nickedInfo}, - #{checkUser}, - #{checkUserPhone}, - 0, - #{dangerType}, - #{recheckSend}, - #{recheckSendUser}, - 0, - #{createUser}, - NOW() - ); - - - - update smz_ssp_problemmodify - - marks_picture = #{marksPicture}, - marks_video = #{marksVideo}, - smark_url = #{smarkUrl}, - - where id = #{id} - - - - - INSERT INTO - smz_ssp_auditinfo - ( mainId, - processState, - opinion, - isDel, - createUser, - createTime) - VALUES ( - #{mainId}, - #{processState}, - #{opinion}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_marksflow - ( - id, - mainId, - checkState, - marksRemark, - isDel, - createUser, - createTime) - VALUES ( - #{id}, - #{mainId}, - #{checkState}, - #{marksRemark}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_fileinfo - ( auditId, - fileType, - fileUrl, - isDel, - createUser, - createTime) - VALUES ( - #{auditId}, - #{fileType}, - #{fileUrl}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_markfileinfo - ( - externalId, - fileType, - fileUrl, - isDel, - createUser, - createTime) - VALUES ( - #{externalId}, - #{fileType}, - #{fileUrl}, - 0, - #{createUser}, - NOW() - ) - - - - - UPDATE ${tableName} SET ${fieldName} = #{checkState} WHERE ${keySet} = #{id} - - - - UPDATE ${tableName} SET ${fieldName} = #{checkState},updateTime = NOW() WHERE ${keySet} = #{id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO - smz_ssp_auditinfo - ( mainId, - processState, - opinion, - isDel, - createUser, - createTime) - VALUES ( - #{mainId}, - 2, - #{opinion}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_auditinfo - ( mainId, - processState, - opinion, - isDel, - createUser, - createTime) - VALUES ( - #{mainId}, - 4, - #{opinion}, - 0, - #{createUser}, - NOW() - ) - - - - - - - - - - - - - - UPDATE `smz_ssp_quality_mark_approve` SET - - state = ${state}, - - - `explain` = #{explain}, - - update_time = NOW() - WHERE mark_id = ${mark_id} AND login_name = #{loginName} - - - - UPDATE `smz_ssp_quality_mark` SET - state = ${state}, - update_user = #{loginName}, - update_time = NOW() - WHERE mark_id = ${mark_id} - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/mapper/PshMarksMapper.xml b/ruoyi-wechat/src/main/resources/mapper/PshMarksMapper.xml deleted file mode 100644 index c7077586..00000000 --- a/ruoyi-wechat/src/main/resources/mapper/PshMarksMapper.xml +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, marks_location, marks_time, marks_picture, marks_video, - project_type, process_name, position_part, marks_remark, - auditor_person, create_date, create_user, auditorPhone,checkState, projectId,project_name from smz_ssp_marks - - - - - - - - - - - - - insert into smz_ssp_marks - - id, - marks_location, - marks_time, - marks_picture, - marks_video, - project_type, - process_name, - position_part, - marks_remark, - auditor_person, - create_date, - create_user, - projectId, - project_name, - checkState, - auditorPhone, - infoType, - is_del - - - #{id}, - #{marksLocation}, - #{marksTime}, - #{marksPicture}, - #{marksVideo}, - #{projectType}, - #{processName}, - #{positionPart}, - #{marksRemark}, - #{auditorPerson}, - #{createDate}, - #{createUser}, - #{projectId}, - #{projectName}, - #{checkState}, - #{auditorPhone}, - 0, - 0 - - - - - update smz_ssp_marks - - marks_location = #{marksLocation}, - marks_time = #{marksTime}, - marks_picture = #{marksPicture}, - marks_video = #{marksVideo}, - project_type = #{projectType}, - process_name = #{processName}, - position_part = #{positionPart}, - marks_remark = #{marksRemark}, - auditor_person = #{auditorPerson}, - create_date = #{createDate}, - create_user = #{createUser}, - projectId = #{projectId}, - project_name = #{projectName}, - auditorPhone = #{auditorPhone}, - checkState = #{checkState}, - smark_url = #{smarkUrl}, - surveyorName = #{surveyorName}, - surveyorId = #{surveyorId}, - surveyorTime = #{surveyorTime}, - surveyorContent = #{surveyorContent} - update_date = #{updateDate} - - where id = #{id} - - - - delete from smz_ssp_marks where id = #{id} - - - - delete from smz_ssp_marks where id in - - #{id} - - - - - - insert into smz_ssp_marks - - id, - marks_location, - marks_time, - project_type, - process_name, - position_part, - marks_remark, - auditor_person, - create_date, - create_user, - projectId, - project_name, - checkState, - auditorPhone, - idcardnum, - infoType, - is_del - - - #{id}, - #{marksLocation}, - #{marksTime}, - #{projectType}, - #{processName}, - #{positionPart}, - #{marksRemark}, - #{auditorPerson}, - NOW(), - #{createUser}, - #{projectId}, - #{projectName}, - 0, - #{auditorPhone}, - #{idcardnum}, - 0, - 0 - - - - - - - - - - - - - - - - - - - - - update smz_ssp_marks - - marks_picture = #{picture} - - where id = #{id} - - - - update smz_ssp_marks - - marks_video = #{video} - - where id = #{id} - - - - update smz_ssp_marks - - smark_url = #{smarkUrl} - - where id = #{id} - - - - - - - INSERT INTO `smz_ssp_quality_mark`( - project_id, - work_time, - before_imgs, - after_imgs, - position_id, - paragrap_id, - location_id, - conclusion, - sz_user, - zj_user_id, - zb_user_id, - jl_user_id, - create_user, - create_time - ) - VALUES( - #{projectId}, - #{workTime}, - #{beforeImgs}, - #{afterImgs}, - #{positionId}, - #{paragrapId}, - #{locationId}, - #{conclusion}, - #{szUser}, - #{zjUserId}, - #{zbUserId}, - #{jlUserId}, - #{createUser}, - NOW() - ) - - - - INSERT INTO `smz_ssp_quality_mark_approve`(mark_id,user_id,user_name,login_name,sort,state,create_time) - VALUES(#{markId},#{userId},#{userName},#{loginName},#{sort},0,NOW()) - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/mapper/SspMapper.xml b/ruoyi-wechat/src/main/resources/mapper/SspMapper.xml deleted file mode 100644 index ffc0a3ec..00000000 --- a/ruoyi-wechat/src/main/resources/mapper/SspMapper.xml +++ /dev/null @@ -1,692 +0,0 @@ - - - - - - - - - - - - - - - - - - - INSERT INTO - smz_ssp_problemmodify - ( projectId, - infoType, - problemArea, - workParts, - changeInfo, - lordSent, - lordSentUser, - copySend, - copySendUser, - checkState, - nickedTime, - danger_type, - recheckSend, - recheckSendUser, - roleType, - isDel, - createUser, - createTime ) - VALUES - ( - #{projectId}, - 1, - #{problemArea}, - #{workParts}, - #{changeInfo}, - #{lordSent}, - #{lordSentUser}, - #{copySend}, - #{copySendUser}, - 0, - #{nickedTime}, - #{dangerType}, - #{recheckSend}, - #{recheckSendUser}, - #{roleType}, - 0, - #{createUser}, - NOW() - ); - - - - INSERT INTO - smz_ssp_problemmodify - ( projectId, - infoType, - workParts, - nickedArea, - nickedTime, - projectType, - processName, - projectName, - nickedInfo, - checkUser, - checkUserPhone, - checkState, - danger_type, - recheckSend, - recheckSendUser, - isDel, - createUser, - createTime ) - VALUES - ( - #{projectId}, - 1, - #{workParts}, - #{nickedArea}, - #{nickedTime}, - #{projectType}, - #{processName}, - #{projectName}, - #{nickedInfo}, - #{checkUser}, - #{checkUserPhone}, - 0, - #{dangerType}, - #{recheckSend}, - #{recheckSendUser}, - 0, - #{createUser}, - NOW() - ); - - - - update smz_ssp_problemmodify - - marks_picture = #{marksPicture}, - marks_video = #{marksVideo}, - smark_url = #{smarkUrl}, - - where id = #{id} - - - - - INSERT INTO - smz_ssp_auditinfo - ( mainId, - processState, - opinion, - isDel, - createUser, - createTime) - VALUES ( - #{mainId}, - #{processState}, - #{opinion}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_marksflow - ( - id, - mainId, - checkState, - marksRemark, - isDel, - createUser, - createTime) - VALUES ( - #{id}, - #{mainId}, - #{checkState}, - #{marksRemark}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_fileinfo - ( auditId, - fileType, - fileUrl, - isDel, - createUser, - createTime) - VALUES ( - #{auditId}, - #{fileType}, - #{fileUrl}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_markfileinfo - ( - externalId, - fileType, - fileUrl, - isDel, - createUser, - createTime) - VALUES ( - #{externalId}, - #{fileType}, - #{fileUrl}, - 0, - #{createUser}, - NOW() - ) - - - - - UPDATE ${tableName} SET ${fieldName} = #{checkState} WHERE ${keySet} = #{id} - - - - UPDATE ${tableName} SET ${fieldName} = #{checkState},updateTime = NOW() WHERE ${keySet} = #{id} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO - smz_ssp_auditinfo - ( mainId, - processState, - opinion, - isDel, - createUser, - createTime) - VALUES ( - #{mainId}, - 2, - #{opinion}, - 0, - #{createUser}, - NOW() - ) - - - - - INSERT INTO - smz_ssp_auditinfo - ( mainId, - processState, - opinion, - isDel, - createUser, - createTime) - VALUES ( - #{mainId}, - 4, - #{opinion}, - 0, - #{createUser}, - NOW() - ) - - - - - - - - - - - - - - UPDATE `smz_ssp_quality_mark_approve` SET - - state = ${state}, - - - `explain` = #{explain}, - - update_time = NOW() - WHERE mark_id = ${mark_id} AND login_name = #{loginName} - - - - UPDATE `smz_ssp_quality_mark` SET - state = ${state}, - update_user = #{loginName}, - update_time = NOW() - WHERE mark_id = ${mark_id} - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/mapper/SspMarksMapper.xml b/ruoyi-wechat/src/main/resources/mapper/SspMarksMapper.xml deleted file mode 100644 index f1a7bf99..00000000 --- a/ruoyi-wechat/src/main/resources/mapper/SspMarksMapper.xml +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, marks_location, marks_time, marks_picture, marks_video, - project_type, process_name, position_part, marks_remark, - auditor_person, create_date, create_user, auditorPhone,checkState, projectId,project_name from smz_ssp_marks - - - - - - - - - - - - - insert into smz_ssp_marks - - id, - marks_location, - marks_time, - marks_picture, - marks_video, - project_type, - process_name, - position_part, - marks_remark, - auditor_person, - create_date, - create_user, - projectId, - project_name, - checkState, - auditorPhone, - infoType, - is_del - - - #{id}, - #{marksLocation}, - #{marksTime}, - #{marksPicture}, - #{marksVideo}, - #{projectType}, - #{processName}, - #{positionPart}, - #{marksRemark}, - #{auditorPerson}, - #{createDate}, - #{createUser}, - #{projectId}, - #{projectName}, - #{checkState}, - #{auditorPhone}, - 1, - 0 - - - - - update smz_ssp_marks - - marks_location = #{marksLocation}, - marks_time = #{marksTime}, - marks_picture = #{marksPicture}, - marks_video = #{marksVideo}, - project_type = #{projectType}, - process_name = #{processName}, - position_part = #{positionPart}, - marks_remark = #{marksRemark}, - auditor_person = #{auditorPerson}, - create_date = #{createDate}, - create_user = #{createUser}, - projectId = #{projectId}, - project_name = #{projectName}, - auditorPhone = #{auditorPhone}, - checkState = #{checkState}, - smark_url = #{smarkUrl}, - surveyorName = #{surveyorName}, - surveyorId = #{surveyorId}, - surveyorTime = #{surveyorTime}, - surveyorContent = #{surveyorContent} - update_date = #{updateDate} - - where id = #{id} - - - - delete from smz_ssp_marks where id = #{id} - - - - delete from smz_ssp_marks where id in - - #{id} - - - - - - insert into smz_ssp_marks - - id, - marks_location, - marks_time, - project_type, - process_name, - position_part, - marks_remark, - auditor_person, - create_date, - create_user, - projectId, - project_name, - checkState, - auditorPhone, - idcardnum, - infoType, - is_del - - - #{id}, - #{marksLocation}, - #{marksTime}, - #{projectType}, - #{processName}, - #{positionPart}, - #{marksRemark}, - #{auditorPerson}, - NOW(), - #{createUser}, - #{projectId}, - #{projectName}, - 0, - #{auditorPhone}, - #{idcardnum}, - 1, - 0 - - - - - - - - - - - - - - - - - - - - - update smz_ssp_marks - - marks_picture = #{picture} - - where id = #{id} - - - - update smz_ssp_marks - - marks_video = #{video} - - where id = #{id} - - - - update smz_ssp_marks - - smark_url = #{smarkUrl} - - where id = #{id} - - - - - - - INSERT INTO `smz_ssp_quality_mark`( - project_id, - work_time, - before_imgs, - after_imgs, - position_id, - paragrap_id, - location_id, - conclusion, - sz_user, - zj_user_id, - zb_user_id, - jl_user_id, - create_user, - create_time - ) - VALUES( - #{projectId}, - #{workTime}, - #{beforeImgs}, - #{afterImgs}, - #{positionId}, - #{paragrapId}, - #{locationId}, - #{conclusion}, - #{szUser}, - #{zjUserId}, - #{zbUserId}, - #{jlUserId}, - #{createUser}, - NOW() - ) - - - - INSERT INTO `smz_ssp_quality_mark_approve`(mark_id,user_id,user_name,login_name,sort,state,create_time) - VALUES(#{markId},#{userId},#{userName},#{loginName},#{sort},0,NOW()) - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/mapper/UserLoginMapper.xml b/ruoyi-wechat/src/main/resources/mapper/UserLoginMapper.xml deleted file mode 100644 index 29162f6d..00000000 --- a/ruoyi-wechat/src/main/resources/mapper/UserLoginMapper.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - update sys_user set password =#{password} where phonenumber = #{loginName} - - - - - insert into sys_user_openid - ( - openId, - userId, - loginName, - nickname, - creatTime - ) values - ( - #{openId}, - #{userId}, - #{loginName}, - #{nickname}, - now() - ) - - - - - update sys_user_openid set userId=#{userId},loginName=#{loginName},nickname=#{nickname} where openId =#{openId} and isDel = 0 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml index 2ff604de..1f48580e 100644 --- a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml +++ b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml @@ -2,7 +2,7 @@ - + + + + update sys_user set password =#{password} where phonenumber = #{loginName} + + \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/static/css/ssp/bootstrap.min.css b/ruoyi-wechat/src/main/resources/static/css/ssp/bootstrap.min.css deleted file mode 100644 index ed3905e0..00000000 --- a/ruoyi-wechat/src/main/resources/static/css/ssp/bootstrap.min.css +++ /dev/null @@ -1,6 +0,0 @@ -/*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} -/*# sourceMappingURL=bootstrap.min.css.map */ \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/static/css/ssp/commes.css b/ruoyi-wechat/src/main/resources/static/css/ssp/commes.css deleted file mode 100644 index 5c63deb2..00000000 --- a/ruoyi-wechat/src/main/resources/static/css/ssp/commes.css +++ /dev/null @@ -1,31 +0,0 @@ -@charset "utf-8"; -/* CSS Document */ -html,body,div,span,h1,h2,h3,h4,h5,h6,p,pre,a,code,em,img,small,strong,sub,sup,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label{margin:0; padding:0; border:0; outline:0; vertical-align:baseline; background:transparent} -a{color:#007bc4; text-decoration:none; cursor:pointer;} -.table_parameters a:hover{text-decoration: none} -a:hover{text-decoration:underline} -ol,ul{list-style:none} -table{border-collapse:collapse; border-spacing:0} -/*html{background:url(../images/demo_bg.png)}*/ -body{height:100%;} - -.clearfix:after{visibility:hidden; display:block; font-size:0; content:" "; clear:both; height:0} - -.container{width:100%; float:left; height:auto; border-bottom: solid 1px #eeeeee; padding-bottom:10px;padding-top:10px} -.header{width:60px; height:60px; float:left; margin-left:15px} -.header img{ width:100%; height:100%} -.right_con{ margin-left:85px; display:block; margin-right:15px} -.use{width:100%; float:left; height:30px; line-height:30px;} -.usename{} -.usename span{color:#ed4947; font-size:1.3em} -.usename em{ float:right; font-style:normal; font-size:1em; color:#b8b8b8} -.demo{width:700px; margin:0 auto} -.demo p.fx_content{ float:left; height:auto; margin:0 ; padding:0; font-size:1.1em; line-height:22px; margin-top:5px} - -.demo{width:100%; float:right;height:auto} -.my-gallery {width: 100%; margin-top:15px} -.my-gallery img { display:block; float:left} -.my-gallery figure {width: 90px; height: 90px;display: block;float: left;margin: 5px; overflow: hidden;} -.my-gallery figcaption { display: none; } - -.fx_address{ float:left;width:100%; margin-top:25px;height:25px; line-height:25px; font-size:1em; color:#b8b8b8; background:url(../images/dingwei.png) no-repeat left center; background-size:18px 20px; text-indent:20px} \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/static/css/ssp/date.css b/ruoyi-wechat/src/main/resources/static/css/ssp/date.css deleted file mode 100644 index 1aeec69f..00000000 --- a/ruoyi-wechat/src/main/resources/static/css/ssp/date.css +++ /dev/null @@ -1,129 +0,0 @@ -body{ - font-family:PingFangSC-Regular; -} -a { - text-decoration: none; -} - -ol,li { - margin: 0; - padding: 0 -} - -li { - list-style-type: none -} - -#date-wrapper { - position: fixed; - bottom: 0; - left: 50%; - width: 100%; - margin: -139px 0 0 -50%; - z-index: 56; - text-align: center; - background: #263466; - border-radius: 3px; - padding-bottom: 10px; - display: none; - -} - -#d-mask { - position: fixed; - width: 100%; - height: 100%; - top: 0; - left: 0; - background: #000; - filter: alpha(Opacity=50); - -moz-opacity: .5; - opacity: .5; - z-index: 55; - display: none -} - -#date-wrapper h3 { - font-family:PingFangSC-Regular; - line-height: 50px; - font-size: 15px; - margin: 0; - border-radius: 3px 3px 0 0 -} - -#date-wrapper ol,#d-tit>div { - width: 20%; - float: left; - position: relative -} - -#d-content { - padding: 10px; -} - -#d-content #d-bg { - height: 120px; - overflow: hidden; - margin-bottom: 10px; - position: relative; - border: 1px solid #5567a9; -} - -#d-cancel,#d-confirm { - border-radius: 3px; - float: left; - width: 40%; - line-height: 30px; - font-size: 15px; - margin: 0 5%; - padding-top: 10px; -} - -#d-confirm { - color:#8466fe -} - -#date-wrapper li { - line-height: 40px; - height: 40px; - cursor: pointer; - position: relative -} - -#d-tit { - overflow: hidden; - line-height: 30px; - margin-bottom: -1px -} - -#date-wrapper ol { - -webkit-overflow-scrolling: touch; - position: absolute; - top: 0; - left: 0 -} -#date-wrapper ol:nth-child(2) { - left: 20%; -} -#date-wrapper ol:nth-child(3) { - left: 40%; -} -#date-wrapper ol:nth-child(4) { - left: 60%; -} -#date-wrapper ol:nth-child(5) { - left: 80%; -} -#date-wrapper ol:nth-child(6) { - left: 100%; -} -#d-content #d-bg:after{ - content: ''; - height: 40px; - background: #0d1d55; - position: absolute; - top: 40px; - left: 0; - width: 100%; - z-index: -1; -} diff --git a/ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/default-skin.css b/ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/default-skin.css deleted file mode 100644 index 04af9220..00000000 --- a/ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/default-skin.css +++ /dev/null @@ -1,483 +0,0 @@ -/*! PhotoSwipe Default UI CSS by Dmitry Semenov | photoswipe.com | MIT license */ -/* - - Contents: - - 1. Buttons - 2. Share modal and links - 3. Index indicator ("1 of X" counter) - 4. Caption - 5. Loading indicator - 6. Additional styles (root element, top bar, idle state, hidden state, etc.) - -*/ -/* - - 1. Buttons - - */ -/* - -
- -
- - - - - -
-
-
    -
  • {{item.project_type}}
    • -
-
    -
  • {{item.name}}
    • -
-
    -
  • {{item.name}}
    • -
-
-
- - - - - -
-
-
-
-
-
-
- -
-
-
- 请选择 -
-
-
-
- - -
-
-
-
-
{{item.dep}}
-
    -
  • - {{li.name}} - {{li.phone}} -
    • -
-
-
-
-
- - - - - - -
-
-
- -
-
-
添加成功
-
-
- -
-
-
- - -
-
-
-
- -
-
-

工序名称

-
-
-
-
- -
-
- - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/reportWithmarks2.html b/ruoyi-wechat/src/main/resources/templates/pshManage/reportWithmarks2.html deleted file mode 100644 index 9adeb9b5..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/reportWithmarks2.html +++ /dev/null @@ -1,840 +0,0 @@ - - - - - - - - - - 安全隐患留痕 - - -
-
-
- -
-
-

质量留痕

-
-
-
-
-
-
-
-
- 项目名称 -
-
- {{projectName}} -
-
-
-
- 施作时间 -
-
- -
-
-
-
- 施作前照片 -
-
-
- -
-
-
- -
-
-

上传格式：只能上传JPG/PNG文件, 且不超过500KB

-
-
-
- 施作后照片 -
-
-
- -
-
-
- -
-
-

上传格式：只能上传JPG/PNG文件, 且不超过500KB

-
-
-
- 检查部位 -
-
- - -
-
-
-
- 检查段位 -
-
- - -
-
-
-
- 焊缝位置 -
-
- - -
-
-
-
- 施作人 -
-
- -
-
-
-
- 质检员 -
-
- - -
-
-
-
- 自检结论 -
-
- - -
-
-
-
- 总包审核人 -
-
- -
-
-
-
- 监理审核人 -
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
- - -
-
-
    -
  • {{item.position_name}}
    • -
-
-
- - -
-
-
    -
  • {{item.paragrap_name}}
    • -
-
-
- - -
-
-
    -
  • {{item.location_name}}
    • -
-
-
- - -
-
-
    -
  • 合格
    • -
  • 整改后合格（1次）
    • -
  • 整改后合格（2次）
    • -
-
-
- - -
-
-
-
-
-
-
- -
-
-
- 请选择 -
-
-
-
- - -
-
-
-
-
{{projectName}}
-
    -
  • - {{li.name}} - {{li.phone}} - -
    • -
-
-
-
-
- - - - - - - - - - - - - - - -
- -
-
-
- -
-
-
提交成功
-
-
- -
-
-
- - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspChange.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspChange.html deleted file mode 100644 index 45b14135..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspChange.html +++ /dev/null @@ -1,798 +0,0 @@ - - - - - - - - - - 安全隐患问题整改 - - - - -
-
-
- -
-
-

问题整改

-
-
-
- -
-
-
- -
正在提交数据！请稍后...
-
-
-
-
- 拍摄位置 -
-
-
-
-
- 图片上传 -
-
-
- -
-
-
- -
-
-
-
-
- 视频上传 -
-
-
- -
×
-
- -
-
视频上传百分比:
-
-
- - -
-
-
- 隐患类型 -
-
- - -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 整改要求 -
-
- -
-
-
-
- 整改截至时间 -
-
- -
-
-
-
- 整改人 -
-
- -
-
-
-
- 复检人 -
-
- -
-
-
-
- 抄送人 -
-
- - -
-
-
-
-
-
- -
-
- -
-
-
-
- - -
-
-
    -
  • {{item.project_type}}
    • -
-
-
- - -
-
-
-
-
-
-
- -
-
-
- 请选择 -
-
-
-
- - -
-
-
-
-
{{item.dep}}
-
    -
  • - {{li.name}} - {{li.phone}} -
    • -
-
-
-
-
-
-
-
已选择 0 人
-
-
-
-
-
- -
-
-
-
-
-
- -
- -
-
-
- 已选择 0 人 - -
-
- - -
-
-
-
-
- -
-
-
- -
-
-
添加成功
-
-
- -
-
-
- - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage.html deleted file mode 100644 index 7c0c5b1c..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage.html +++ /dev/null @@ -1,553 +0,0 @@ - - - - - - - - 安全隐患排查 - - - - - - - - -
-
-
- -
-
-

和我相关

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
拍摄类型
-
-
-
-
留痕上报
-
-
-
问题整改
-
-
-
-
-
-
拍摄时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
流程状态
-
-
-
-
待复检
-
-
-
未通过
-
-
-
已完成
-
-
-
-
- -
- - -
-
- - -
-
- -
-
- -
-
-
-
问题整改
-
-
-
安全留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage2.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage2.html deleted file mode 100644 index 58e18237..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage2.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - 隐蔽工程留痕 - - - - - -
-
-
- -
-
-

隐蔽工程留痕

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
提交时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
审批状态
-
-
-
-
待复检
-
-
-
已通过
-
-
-
未通过
-
-
-
-
- -
- - -
-
- - -
-
- -
-
- -
-
-
-
隐蔽工程留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy.html deleted file mode 100644 index 802caafd..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy.html +++ /dev/null @@ -1,577 +0,0 @@ - - - - - - 安全隐患排查 - - - - - - - - - - -
-
-
- -
-
-

我的发布

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
拍摄类型
-
-
-
-
留痕上报
-
-
-
问题整改
-
-
-
-
-
-
拍摄时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
流程状态
-
-
-
-
待复检
-
-
-
未通过
-
-
-
已完成
-
-
-
-
- -
- - -
-
- - -
-
- -
-
- -
-
-
-
问题整改
-
-
-
安全留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy2.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy2.html deleted file mode 100644 index e66a1eae..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy2.html +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - 安全工程留痕 - - - - - -
-
-
- -
-
-

隐蔽工程留痕

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
提交时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
审批状态
-
-
-
-
待复检
-
-
-
已通过
-
-
-
未通过
-
-
-
-
- -
- - -
-
- -
-
- -
-
- -
-
-
-
安全留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspMarkView.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspMarkView.html deleted file mode 100644 index a8bb08cb..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspMarkView.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - 安全留痕查看 - - - - -
-
-
- -
-
-

留痕上报查看

-
-
-
- -
- -
-
- 留痕上报 -
-
-
- 拍摄位置 -
-
- -
-
-
-
- 图片 -
-
-
- - - -
-
-
-
-
- 视频 -
-
-
-
- -
-
-
-
- -
-
- 工程名称 -
-
- -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 工序名称 -
-
- -
-
-
-
- 上报人身份证号码 -
-
- -
-
-
-
- 审核人 -
-
- -
-
-
-
- 留痕时间 -
-
- -
-
-
-
- - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspQualityMarkDetail.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspQualityMarkDetail.html deleted file mode 100644 index c947a414..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspQualityMarkDetail.html +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - 安全隐蔽工程留痕 - - - - -
-
-
- -
-
-

隐蔽工程留痕

-
-
-
- -
- -
-
- 提交记录详情 -
-
-
- 项目名称 -
-
-
-
-
-
- 施作时间 -
-
- -
-
-
-
- 施作前照片 -
-
-
- - - -
-
-
-
-
- 施作后照片 -
-
-
- - - -
-
-
-
-
- 检查部位 -
-
- -
-
-
-
- 检查段位 -
-
- -
-
-
-
- 焊缝位置 -
-
- -
-
-
-
- 施作人 -
-
- -
-
-
-
- 质检员 -
-
- -
-
-
-
- 自检结论 -
-
- -
-
-
-
- 总包审批人 -
-
- -
-
-
-
- 总包审批意见 -
-
- -
-
-
-
- 监理审批人 -
-
- -
-
-
-
- 监理审批意见 -
-
- -
-
-
- -
-
-
- -
-
-
-
- -
-
- -
-
-
-
- - - - -
-
-
- -
-
-
审批成功
-
-
- -
-
-
- - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/pshManage/sspStayCheck.html b/ruoyi-wechat/src/main/resources/templates/pshManage/sspStayCheck.html deleted file mode 100644 index 5846ec73..00000000 --- a/ruoyi-wechat/src/main/resources/templates/pshManage/sspStayCheck.html +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - 安全隐患排查 - - - - -
-
-
- -
-
-

整改

-
-
-
- -
-
- -
正在提交数据！请稍后...
-
- -
-
- 整改意见 -
-
-
- 拍摄位置 -
-
- -
-
-
-
- 图片 -
-
-
- - - -
-
-
-
-
- 视频 -
-
-
-
- -
-
-
-
-
-
- 隐患类型 -
-
- -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 整改要求 -
-
- -
-
-
-
- 检查单位 -
-
- -
-
-
-
- 检查人 -
-
- -
-
-
-
- 检查时间 -
-
- -
-
-
-
- 整改截至时间 -
-
-
-
-
- 驳回意见 -
-
- -
-
-
- -
-
-
- 整改说明 -
-
- -
-
-
-
-
-
- 整改后图片 -
-
-
- - - -
-
-
-
- -
-
-
- -
-
- -
-
-
- -
- - - - - - -
-
-
- -
-
-
添加成功
-
-
- -
-
-
- - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html b/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html deleted file mode 100644 index c4466a82..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - 质量隐患问题 - - - - - - -
-
- -
正在提交数据！请稍后...
-
-
-
- 整改意见 -
-
-
- 拍摄位置 -
-
- -
-
-
-
- 图片 -
-
-
- - - -
-
-
-
-
- 视频 -
-
-
-
- -
-
-
-
-
-
- 隐患类型 -
-
- -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 整改要求 -
-
- -
-
-
-
- 检查单位 -
-
- -
-
-
-
- 检查人 -
-
- -
-
-
-
- 检查时间 -
-
- -
-
-
-
- 整改截至时间 -
-
-
-
-
- 驳回意见 -
-
- -
-
-
- -
-
-
-
- 整改说明 -
-
- -
-
-
-
-
-
- 整改后图片 -
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
-
-
-
- - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks.html b/ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks.html deleted file mode 100644 index 2a70e24a..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks.html +++ /dev/null @@ -1,803 +0,0 @@ - - - - - - - - - - 质量隐患留痕 - - - -
-
-
- -
-
-

问题整改

-
-
-
-
-
-
-
-
- 留痕上报 -
-
- {{form.marksLocation}} -
-
-
-
- 留痕时间 -
-
- -
-
-
-
- 图片上传 -
-
-
- -
-
-
- -
-
-

上传格式：只能上传JPG/PNG文件, 且不超过500KB

-
-
-
- 视频上传 -
-
-
- -
×
-
- -
-
视频上传百分比:
-
-
- - -

上传格式：只能上传MP4文件,且文件应大于30秒

-
-
-
- 隐患类型 -
-
- - -
-
- - - - - - - - - - - - - - - - - - -
-
- 隐患描述 -
-
- -
-
-
-
- 留痕说明 -
-
- -
-
-
-
- 上报人身份证号码 -
-
- -
-
-
-
- 审核人 -
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
- - -
-
-
    -
  • {{item.project_type}}
    • -
-
    -
  • {{item.name}}
    • -
-
    -
  • {{item.name}}
    • -
-
-
- - - - - -
-
-
-
-
-
-
- -
-
-
- 请选择 -
-
-
-
- - -
-
-
-
-
{{item.dep}}
-
    -
  • - {{li.name}} - {{li.phone}} -
    • -
-
-
-
-
- - - - -
- -
-
-
- -
-
-
添加成功
-
-
- -
-
-
- - -
-
-
-
- -
-
-

工序名称

-
-
-
-
- -
-
- - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks2.html b/ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks2.html deleted file mode 100644 index 6018f6ea..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks2.html +++ /dev/null @@ -1,840 +0,0 @@ - - - - - - - - - - 质量隐患留痕 - - -
-
-
- -
-
-

质量留痕

-
-
-
-
-
-
-
-
- 项目名称 -
-
- {{projectName}} -
-
-
-
- 施作时间 -
-
- -
-
-
-
- 施作前照片 -
-
-
- -
-
-
- -
-
-

上传格式：只能上传JPG/PNG文件, 且不超过500KB

-
-
-
- 施作后照片 -
-
-
- -
-
-
- -
-
-

上传格式：只能上传JPG/PNG文件, 且不超过500KB

-
-
-
- 检查部位 -
-
- - -
-
-
-
- 检查段位 -
-
- - -
-
-
-
- 焊缝位置 -
-
- - -
-
-
-
- 施作人 -
-
- -
-
-
-
- 质检员 -
-
- - -
-
-
-
- 自检结论 -
-
- - -
-
-
-
- 总包审核人 -
-
- -
-
-
-
- 监理审核人 -
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
- - -
-
-
    -
  • {{item.position_name}}
    • -
-
-
- - -
-
-
    -
  • {{item.paragrap_name}}
    • -
-
-
- - -
-
-
    -
  • {{item.location_name}}
    • -
-
-
- - -
-
-
    -
  • 合格
    • -
  • 整改后合格（1次）
    • -
  • 整改后合格（2次）
    • -
-
-
- - -
-
-
-
-
-
-
- -
-
-
- 请选择 -
-
-
-
- - -
-
-
-
-
{{projectName}}
-
    -
  • - {{li.name}} - {{li.phone}} - -
    • -
-
-
-
-
- - - - - - - - - - - - - - - -
- -
-
-
- -
-
-
提交成功
-
-
- -
-
-
- - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspChange.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspChange.html deleted file mode 100644 index 2d374527..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspChange.html +++ /dev/null @@ -1,796 +0,0 @@ - - - - - - - - - - 质量隐患问题整改 - - - - -
-
-
- -
-
-

问题整改

-
-
-
- -
-
-
- -
正在提交数据！请稍后...
-
-
-
-
- 拍摄位置 -
-
-
-
-
- 图片上传 -
-
-
- -
-
-
- -
-
-
-
-
- 视频上传 -
-
-
- -
×
-
- -
-
视频上传百分比:
-
-
- - -
-
-
- 隐患类型 -
-
- - -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 整改要求 -
-
- -
-
-
-
- 整改截至时间 -
-
- -
-
-
-
- 整改人 -
-
- -
-
-
-
- 复检人 -
-
- -
-
-
-
- 抄送人 -
-
- - -
-
-
-
-
-
- -
-
- -
-
-
-
- - -
-
-
    -
  • {{item.project_type}}
    • -
-
-
- - -
-
-
-
-
-
-
- -
-
-
- 请选择 -
-
-
-
- - -
-
-
-
-
{{item.dep}}
-
    -
  • - {{li.name}} - {{li.phone}} -
    • -
-
-
-
-
-
-
-
已选择 0 人
-
-
-
-
-
- -
-
-
-
-
-
- -
- -
-
-
- 已选择 0 人 - -
-
- - -
-
-
-
-
- -
-
-
- -
-
-
添加成功
-
-
- -
-
-
- - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage.html deleted file mode 100644 index 8a19ca74..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage.html +++ /dev/null @@ -1,552 +0,0 @@ - - - - - - - - 质量隐患排查 - - - - - - - - -
-
-
- -
-
-

和我相关

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
拍摄类型
-
-
-
-
留痕上报
-
-
-
问题整改
-
-
-
-
-
-
拍摄时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
流程状态
-
-
-
-
待复检
-
-
-
未通过
-
-
-
已完成
-
-
-
-
- -
- - -
-
- - -
-
- -
-
- -
-
-
-
问题整改
-
-
-
质量留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage2.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage2.html deleted file mode 100644 index 8b6a3df8..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage2.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - 隐蔽工程留痕 - - - - - -
-
-
- -
-
-

隐蔽工程留痕

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
提交时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
审批状态
-
-
-
-
待复检
-
-
-
已通过
-
-
-
未通过
-
-
-
-
- -
- - -
-
- - -
-
- -
-
- -
-
-
-
隐蔽工程留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy.html deleted file mode 100644 index f4e91625..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy.html +++ /dev/null @@ -1,577 +0,0 @@ - - - - - - 质量隐患排查 - - - - - - - - - - -
-
-
- -
-
-

我的发布

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
拍摄类型
-
-
-
-
留痕上报
-
-
-
问题整改
-
-
-
-
-
-
拍摄时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
流程状态
-
-
-
-
待复检
-
-
-
未通过
-
-
-
已完成
-
-
-
-
- -
- - -
-
- - -
-
- -
-
- -
-
-
-
问题整改
-
-
-
质量留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy2.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy2.html deleted file mode 100644 index 9b60c9db..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy2.html +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - 隐蔽工程留痕 - - - - - -
-
-
- -
-
-

隐蔽工程留痕

-
-
-
- -
-
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
- 和我相关（） -
-
- 我的发布（） -
-
-
-
- -
-
- - -
- -
-
- - × -
-
-
提交时间
-
-
-
- -
-
-
—
-
-
- -
-
-
-
-
-
审批状态
-
-
-
-
待复检
-
-
-
已通过
-
-
-
未通过
-
-
-
-
- -
- - -
-
- -
-
- -
-
- -
-
-
-
质量留痕
-
-
-
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspMarkView.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspMarkView.html deleted file mode 100644 index 94a3dc26..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspMarkView.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - 质量留痕查看 - - - - -
-
-
- -
-
-

留痕上报查看

-
-
-
- -
- -
-
- 留痕上报 -
-
-
- 拍摄位置 -
-
- -
-
-
-
- 图片 -
-
-
- - - -
-
-
-
-
- 视频 -
-
-
-
- -
-
-
-
- -
-
- 工程名称 -
-
- -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 工序名称 -
-
- -
-
-
-
- 上报人身份证号码 -
-
- -
-
-
-
- 审核人 -
-
- -
-
-
-
- 留痕时间 -
-
- -
-
-
-
- - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspQualityMarkDetail.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspQualityMarkDetail.html deleted file mode 100644 index 06799f30..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspQualityMarkDetail.html +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - 质量隐蔽工程留痕 - - - - -
-
-
- -
-
-

隐蔽工程留痕

-
-
-
- -
- -
-
- 提交记录详情 -
-
-
- 项目名称 -
-
-
-
-
-
- 施作时间 -
-
- -
-
-
-
- 施作前照片 -
-
-
- - - -
-
-
-
-
- 施作后照片 -
-
-
- - - -
-
-
-
-
- 检查部位 -
-
- -
-
-
-
- 检查段位 -
-
- -
-
-
-
- 焊缝位置 -
-
- -
-
-
-
- 施作人 -
-
- -
-
-
-
- 质检员 -
-
- -
-
-
-
- 自检结论 -
-
- -
-
-
-
- 总包审批人 -
-
- -
-
-
-
- 总包审批意见 -
-
- -
-
-
-
- 监理审批人 -
-
- -
-
-
-
- 监理审批意见 -
-
- -
-
-
- -
-
-
- -
-
-
-
- -
-
- -
-
-
-
- - - - -
-
-
- -
-
-
审批成功
-
-
- -
-
-
- - - - - - - - - \ No newline at end of file diff --git a/ruoyi-wechat/src/main/resources/templates/sspManage/sspStayCheck.html b/ruoyi-wechat/src/main/resources/templates/sspManage/sspStayCheck.html deleted file mode 100644 index 247b0253..00000000 --- a/ruoyi-wechat/src/main/resources/templates/sspManage/sspStayCheck.html +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - 质量隐患排查 - - - - -
-
-
- -
-
-

整改

-
-
-
- -
-
- -
正在提交数据！请稍后...
-
- -
-
- 整改意见 -
-
-
- 拍摄位置 -
-
-
-
-
- 图片 -
-
-
- - - -
-
-
-
-
- 视频 -
-
-
-
- -
-
-
-
-
-
- 隐患类型 -
-
- -
-
-
-
- 隐患描述 -
-
- -
-
-
-
- 整改要求 -
-
- -
-
-
-
- 检查单位 -
-
- -
-
-
-
- 检查人 -
-
- -
-
-
-
- 检查时间 -
-
- -
-
-
-
- 整改截至时间 -
-
-
-
-
- 驳回意见 -
-
- -
-
-
- -
-
-
- 整改说明 -
-
- -
-
-
-
-
-
- 整改后图片 -
-
-
- - - -
-
-
-
- -
-
-
- -
-
- -
-
-
- -
- - - - - - -
-
-
- -
-
-
添加成功
-
-
- -
-
-
- - - - - - - - - \ No newline at end of file diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java index 5b4cfe02..4fc22079 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/VideoController.java @@ -43,20 +43,21 @@ public class VideoController extends BaseController { * 修改视频通道状态 */ @GetMapping("/editPassageState") - public AjaxResult editPassageState(@RequestParam Long id, String videoDvrNumber, String passageState) + public AjaxResult editPassageState(Long id, String videoDvrNumber, String passageState) { SurProjectVideoPassage surProjectVideoPassage = new SurProjectVideoPassage(); surProjectVideoPassage.setVideoId(id); surProjectVideoPassage.setVideoDvrNumber(videoDvrNumber); surProjectVideoPassage.setPassageState(passageState); - return success(surProjectVideoConfigService.editPassageState(surProjectVideoPassage)); + surProjectVideoConfigService.editPassageState(surProjectVideoPassage); + return success(surProjectVideoConfigService.updateSurProjectVideoConfigSignalState(videoDvrNumber)); } /** * 获取视频配置详细信息 */ - @GetMapping(value = "/getVideoPassage/{videoDvrNumberd}") - public AjaxResult getVideoPassage(@PathVariable("videoDvrNumberd") String videoDvrNumberd) + @GetMapping(value = "/getVideoPassage") + public AjaxResult getVideoPassage(String videoDvrNumberd) { return success(surProjectVideoConfigService.getVideoPassage(videoDvrNumberd)); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectVideoConfigController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectVideoConfigController.java index cd69eb01..7a3cde7b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectVideoConfigController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/controller/SurProjectVideoConfigController.java @@ -153,7 +153,9 @@ public class SurProjectVideoConfigController extends BaseController @PostMapping("/editPassageState") public AjaxResult editPassageState(@RequestBody SurProjectVideoPassage surProjectVideoPassage) { - return success(surProjectVideoConfigService.editPassageState(surProjectVideoPassage)); + surProjectVideoConfigService.editPassageState(surProjectVideoPassage); + + return success(surProjectVideoConfigService.updateSurProjectVideoConfigSignalState(surProjectVideoPassage.getVideoDvrNumber())); } /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectVideoConfigService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectVideoConfigService.java index bb580f32..e559f471 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectVideoConfigService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/ISurProjectVideoConfigService.java @@ -85,4 +85,12 @@ public interface ISurProjectVideoConfigService * @return 结果 */ public List getVideoPassage(String videoDvrNumberd); + + /** + * 修改设备状态 + * + * @param surProjectVideoConfig 视频通道 + */ + + public int updateSurProjectVideoConfigSignalState(String videoDvrNumberd); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java index e4b0e446..90212208 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java @@ -63,6 +63,7 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS { surProjectVideoConfig.setVideoPassageCount(surProjectVideoConfig.getSurProjectVideoPassageList().size()); + surProjectVideoConfig.setPassagePassCount(surProjectVideoConfig.getVideoPassageCount()); surProjectVideoConfig.setIsDel(PublicStateEnum.OK.getCode()); //新增的视频为离线 surProjectVideoConfig.setSignalState(PublicStateEnum.VIDEO_UNKNOWN.getCode()); @@ -87,6 +88,7 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS surProjectVideoConfig.setProjectId(0L); } surProjectVideoConfig.setVideoPassageCount(surProjectVideoConfig.getSurProjectVideoPassageList().size()); + surProjectVideoConfig.setPassagePassCount(surProjectVideoConfig.getVideoPassageCount()); surProjectVideoConfig.setUpdateBy(SecurityUtils.getUsername()); surProjectVideoConfig.setUpdateTime(DateUtils.getNowDate()); surProjectVideoConfigMapper.deleteSurProjectVideoPassageByVideoId(surProjectVideoConfig.getId()); @@ -143,8 +145,18 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS @Override @Transactional public int editPassageState(SurProjectVideoPassage SurProjectVideoPassage) { - surProjectVideoConfigMapper.updateProjectVideoPassageState(SurProjectVideoPassage); - SurProjectVideoConfig surProjectVideoConfig = surProjectVideoConfigMapper.selectSurProjectVideoConfigByDvrNumber(SurProjectVideoPassage.getVideoDvrNumber()); + return surProjectVideoConfigMapper.updateProjectVideoPassageState(SurProjectVideoPassage); + } + + /** + * 修改设备状态 + * + * @param videoDvrNumber 设备编号 + */ + @Override + @Transactional + public int updateSurProjectVideoConfigSignalState(String videoDvrNumber){ + SurProjectVideoConfig surProjectVideoConfig = surProjectVideoConfigMapper.selectSurProjectVideoConfigByDvrNumber(videoDvrNumber); int res = 0; for(SurProjectVideoPassage passage:surProjectVideoConfig.getSurProjectVideoPassageList()){ if(passage.getPassageState().equals(PublicStateEnum.VIDEO_ONLINE.getCode())){