diff --git a/pom.xml b/pom.xml
index ad9bc5648101974e4d620e1698f6f84493cef00f..9b2177f3ec3591aacd87185dc094acfc7c0a0796 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.example
- springboot_v2
+ com.zsess.mian
+ taskManage
jar
- springboot_v2
- springbootv2系统
+ taskManage_v1
+ 任务跟踪管理系统
org.springframework.boot
@@ -66,20 +66,20 @@
pagehelper-spring-boot-starter
1.2.5
-
+
+
mysql
mysql-connector-java
8.0.11
- -->
+
@@ -198,11 +198,11 @@
1.9
- ueditor
- 1.4.3
- 1.8
- system
- ${basedir}/lib/ueditor-1.1.2.jar
+ baidu
+ ueditor
+ 1.1.2
+
+
@@ -225,6 +225,31 @@
+
+
+ org.apache.maven.plugins
+ maven-install-plugin
+
+
+
+ install-ueditor
+ clean
+
+ ${basedir}/lib/ueditor-1.1.2.jar
+ default
+ baidu
+ ueditor
+ 1.1.2
+ jar
+ true
+
+
+ install-file
+
+
+
+
+
org.apache.maven.plugins
diff --git a/src/main/java/com/fc/SpringbootStart.java b/src/main/java/com/fc/SpringbootStart.java
index 492ed7532d1ffdca48c212d49a325827fb2020ab..a256055e387209a802b67042e1ef50273a59804e 100644
--- a/src/main/java/com/fc/SpringbootStart.java
+++ b/src/main/java/com/fc/SpringbootStart.java
@@ -10,42 +10,14 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
* @author fuce
*
*/
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication(exclude = DataSourceAutoConfiguration.class,
+ scanBasePackages = {"com.fc.test","com.zsess.taskmanage"})
+//
public class SpringbootStart {
public static void main(String[] args) {
SpringApplication.run(SpringbootStart.class, args);
- System.out.println("*******************************************\n" +
- "* 码云地址 *\n" +
- "* https://gitee.com/bdj/SpringBoot_v2 *\n" +
- "* *\n" +
- "*******************************************\n" +
- " _.._ ,-------------------.\n" +
- " ,' `. ( 启动成功!开启学习之旅! )\n" +
- " / __) __` \\ `-,-----------------'\n" +
- " ( (`-`(-') ) _.-'\n" +
- " /) \\ = / (\n" +
- " /' |--' . \\\n" +
- " ( ,---| `-.)__`\n" +
- " )( `-.,--' _`-.\n" +
- " '/,' ( Uu\",\n" +
- " (_ , `/,-' )\n" +
- " `.__, : `-'/ /`--'\n" +
- " | `--' |\n" +
- " ` `-._ /\n" +
- " \\ (\n" +
- " /\\ . \\. \n" +
- " / |` \\ ,-\\\n" +
- " / \\| .) / \\\n" +
- " ( ,'|\\ ,' :\n" +
- " | \\,`.`--\"/ }\n" +
- " `,' \\ |,' /\n" +
- " / \"-._ `-/ |\n" +
- " \"-. \"-.,'| ;\n" +
- " / _/[\"---'\"\"]\n" +
- " : / |\"- '\n" +
- " ' | /\n" +
- " ` |");
+ System.out.println(" ( 启动成功!)\n");
}
}
diff --git a/src/main/java/com/fc/test/common/base/BaseController.java b/src/main/java/com/fc/test/common/base/BaseController.java
index f75d0d6156fb38cef631f2f508236278bd196c27..3e0d29c29e5a695d7557f51f69a3924b37a59180 100644
--- a/src/main/java/com/fc/test/common/base/BaseController.java
+++ b/src/main/java/com/fc/test/common/base/BaseController.java
@@ -13,6 +13,8 @@ import org.springframework.ui.ModelMap;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
+import javax.annotation.Resource;
+
/**
* web层通用数据处理
* @ClassName: BaseController
@@ -24,8 +26,13 @@ import org.springframework.web.bind.annotation.InitBinder;
public class BaseController
{
//系统用户
- @Autowired
- public SysUserService sysUserService;
+ @Resource
+ public SysUserService sysUserService;
+ /**
+ * 系统部门。
+ */
+ @Resource
+ public SysDepartmentService sysDepartmentService;
//系统角色
@Autowired
@@ -61,9 +68,8 @@ public class BaseController
* 将前台传递过来的日期格式的字符串,自动转化为Date类型
*/
@InitBinder
- public void initBinder(WebDataBinder binder)
- {
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ public void initBinder(WebDataBinder binder) throws Exception {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
dateFormat.setLenient(false);
binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
}
diff --git a/src/main/java/com/fc/test/common/conf/MybatisConfig.java b/src/main/java/com/fc/test/common/conf/MybatisConfig.java
index a26d616c461284721f1a6cfa33ce53e7b5b81b34..eaf73f4296455c5d761dc74b26f568d698ba2ca9 100644
--- a/src/main/java/com/fc/test/common/conf/MybatisConfig.java
+++ b/src/main/java/com/fc/test/common/conf/MybatisConfig.java
@@ -27,7 +27,7 @@ import com.fc.test.common.dataSources.DynamicDataSource;
* @date 2019-12-06 21:11
*/
@Configuration
-@MapperScan(basePackages = "com.fc.test.mapper")
+@MapperScan(basePackages = {"com.fc.test.mapper","com.zsess.taskmanage.mapper"})
public class MybatisConfig {
@Bean
diff --git a/src/main/java/com/fc/test/common/file/FileUploadUtils.java b/src/main/java/com/fc/test/common/file/FileUploadUtils.java
index 7c8412781968c0a18185ad7e3c73c9cdc0538226..4ee4ff1e587a3a84377b565afb55b18c52d3e52f 100644
--- a/src/main/java/com/fc/test/common/file/FileUploadUtils.java
+++ b/src/main/java/com/fc/test/common/file/FileUploadUtils.java
@@ -101,8 +101,8 @@ public class FileUploadUtils {
*
* @param baseDir 相对应用的基目录
* @param file 上传的文件
- * @param needDatePathAndRandomName 是否需要日期目录和随机文件名前缀
- * @param extension 上传文件类型
+// * @param needDatePathAndRandomName 是否需要日期目录和随机文件名前缀
+// * @param extension 上传文件类型
* @return 返回上传成功的文件名
* @throws FileSizeLimitExceededException 如果超出最大大小
* @throws FileNameLengthLimitExceededException 文件名太长
@@ -113,7 +113,11 @@ public class FileUploadUtils {
{
String fileName=file.getOriginalFilename();
// 获得文件后缀名称
- String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase();
+ final int index = fileName.lastIndexOf(".");
+ String suffixName = null;
+ if (index > 0) {
+ suffixName = fileName.substring(index).toLowerCase();
+ }
if(StringUtils.isEmpty(suffixName)) {
//如果没有后缀默认后缀
suffixName=FileUploadUtils.IMAGE_JPG_EXTENSION;
diff --git a/src/main/java/com/fc/test/common/interceptor/MyWebAppConfigurer.java b/src/main/java/com/fc/test/common/interceptor/MyWebAppConfigurer.java
index 8f9ff5715acb2c21b5fcfad66788e140825bb2f7..a8b44e1dcc61c95fd75f5cc21d3d62ca47d752e3 100644
--- a/src/main/java/com/fc/test/common/interceptor/MyWebAppConfigurer.java
+++ b/src/main/java/com/fc/test/common/interceptor/MyWebAppConfigurer.java
@@ -89,6 +89,9 @@ public class MyWebAppConfigurer extends WebMvcConfigurationSupport {
/** 静态资源处理 **/
@Override
protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+ logger.info("静态资源处理【路径 isrootDir = "+ isrootDir+ "】");
+ logger.info("静态资源处理【路径 defaultBaseDir = "+ defaultBaseDir+ "】");
+
//配置虚拟路径为项目得static下面
registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
if(!"Y".equals(isstatic)) {
diff --git a/src/main/java/com/fc/test/common/support/ConvertUtil.java b/src/main/java/com/fc/test/common/support/ConvertUtil.java
index 554f79c2bc0b9ff941cea3c8ab3b720873821565..65955422041930ed44596deadfb47b379c022935 100644
--- a/src/main/java/com/fc/test/common/support/ConvertUtil.java
+++ b/src/main/java/com/fc/test/common/support/ConvertUtil.java
@@ -43,6 +43,7 @@ public class ConvertUtil {
return toIntArray(",", str);
}
+
/**
* 转换为Integer数组
* @param split 分隔符
@@ -102,6 +103,17 @@ public class ConvertUtil {
return stringB;
}
+ /**
+ * 字符串转化为list,
+ * @param str, 分隔符为‘,’
+ * @return
+ */
+ public static List toListIntArray(String str) {
+ final Integer[] intArray = toIntArray(",", str);
+ final List intlist = Arrays.asList(intArray);
+ return intlist;
+ }
+
/**
* 转换为String数组
* @param split 被转换的值
diff --git a/src/main/java/com/fc/test/controller/AdminController.java b/src/main/java/com/fc/test/controller/AdminController.java
index d4a22dfeb1dfb02c3a1d5bc75f523c7d26c878b8..9aa723f25ab677ab14cf0f161b6dbfd461aa17f3 100644
--- a/src/main/java/com/fc/test/controller/AdminController.java
+++ b/src/main/java/com/fc/test/controller/AdminController.java
@@ -1,18 +1,27 @@
package com.fc.test.controller;
import java.util.List;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.fc.test.common.base.BaseController;
import com.fc.test.common.conf.V2Config;
import com.fc.test.common.domain.AjaxResult;
+import com.fc.test.mapper.custom.RoleDao;
import com.fc.test.model.auto.SysNotice;
+import com.fc.test.model.auto.TsysRole;
import com.fc.test.model.auto.TsysUser;
import com.fc.test.model.custom.BootstrapTree;
+import com.fc.test.model.custom.Tablepar;
import com.fc.test.model.custom.TitleVo;
import com.fc.test.shiro.util.ShiroUtils;
import com.fc.test.util.StringUtils;
+import com.github.pagehelper.PageInfo;
import com.google.code.kaptcha.Constants;
+import com.zsess.taskmanage.model.DeptTaskInfo;
+import com.zsess.taskmanage.model.Taskinfo;
+import com.zsess.taskmanage.service.DeptTaskInfoService;
+import com.zsess.taskmanage.service.TaskinfoService;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
@@ -44,7 +53,14 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@RequestMapping("/admin")
public class AdminController extends BaseController{
private static Logger logger=LoggerFactory.getLogger(AdminController.class);
-
+ //角色dao
+ @Resource
+ private RoleDao roleDao ;
+ @Resource
+ private DeptTaskInfoService deptTaskInfoService;
+ @Resource
+ private TaskinfoService taskinfoService;
+ //默认模板前缀
private String prefix = "admin";
@ApiOperation(value="首页",notes="首页")
@@ -54,6 +70,7 @@ public class AdminController extends BaseController{
BootstrapTree bootstrapTree= sysPermissionService.getbooBootstrapTreePerm(ShiroUtils.getUserId());
request.getSession().setAttribute("bootstrapTree", bootstrapTree);
request.getSession().setAttribute("sessionUserName",ShiroUtils.getUser().getNickname());
+ request.getSession().setAttribute("roleid", 1);
//获取公告信息
List notices=sysNoticeService.getuserNoticeNotRead(ShiroUtils.getUser(),0);
request.getSession().setAttribute("notices",notices);
@@ -66,10 +83,104 @@ public class AdminController extends BaseController{
setTitle(map, new TitleVo("首页", "首页", true,"欢迎进入", true, false));
return prefix+"/main";
}
+
+ @ApiOperation(value="首页控制面板",notes="控制面板")
+ @GetMapping("/control")
+ public String control(ModelMap map) {
+ String pageUrl = prefix + "/control";
+ String uid=ShiroUtils.getUserId();
+ boolean isLeader = false;
+ final List tsysRoles= roleDao.queryUserRole(uid);
+ Integer roleOrder = null;
+ for(TsysRole role : tsysRoles) {
+ roleOrder = role.getOrder();
+ break;
+ }
+ switch(roleOrder) {
+ case 1: pageUrl = this.controlForLeader(map);
+ break;
+ case 2:pageUrl = this.controlForTaskStart(map);
+ break;
+ case 3:pageUrl = this.controlForProcessLeader(map);
+ break;
+ default: pageUrl = this.controlForProcessExecutor(map);;
+ }
+ return pageUrl;
+
+ }
+
+ /**
+ * 通用个人(普通执法人员)主页控制台.
+ * @param map
+ * @return
+ */
+ private String controlForProcessExecutor(ModelMap map) {
+ setTitle(map, new TitleVo("个人主页", "首页", true,"欢迎进入", true, false));
+ Tablepar tablepar = new Tablepar();
+ tablepar.setIsAsc("asc");
+ tablepar.setPageNum(1);
+ tablepar.setPageSize(10);
+ Taskinfo record = new Taskinfo();
+ final PageInfo page=taskinfoService.taskProcesslistForExecutor(tablepar,record) ;
+ map.addAttribute("tasknum",page.getTotal());
+ return "taskmanage/controlForProcessExecutor";
+ }
+ /**
+ * 通用个人(科室负责人)主页控制台.
+ * @param map
+ * @return
+ */
+ private String controlForProcessLeader(ModelMap map) {
+ setTitle(map, new TitleVo("个人主页", "首页", true,"欢迎进入", true, false));
+ Tablepar tablepar = new Tablepar();
+ tablepar.setIsAsc("asc");
+ tablepar.setPageNum(1);
+ tablepar.setPageSize(10);
+ Taskinfo record = new Taskinfo();
+ final PageInfo page=taskinfoService.taskProcesslist(tablepar,record) ;
+ map.addAttribute("tasknum",page.getTotal());
+ return "taskmanage/controlForProcessLeader";
+ }
+ /**
+ * 个人(任務發起)主页控制台.
+ * @param map
+ * @return
+ */
+ private String controlForTaskStart(ModelMap map) {
+ setTitle(map, new TitleVo("个人主页", "首页", true,"欢迎进入", true, false));
+
+ Tablepar tablepar = new Tablepar();
+ tablepar.setIsAsc("asc");
+ tablepar.setPageNum(1);
+ tablepar.setPageSize(10);
+ Taskinfo record = new Taskinfo();
+ final PageInfo page= taskinfoService.listForAddTask(tablepar,record) ;
+ map.addAttribute("tasknum",page.getTotal());
+ return "taskmanage/controlForTaskStart";
+ }
+
+ @ApiOperation(value="高级管理员个人主页",notes="高级管理员个人主页")
+ public String controlForLeader(ModelMap map) {
+ setTitle(map, new TitleVo("个人主页", "首页", true,"欢迎进入", true, false));
+ final Listdepttaskinfos = this.deptTaskInfoService.getDeptExeTaskInfoForControl();
+ for(int i=0; i<4;i++) {
+ final DeptTaskInfo depttask = depttaskinfos.get(i);
+ map.addAttribute("depttask" + i,depttask);
+ }
+ Tablepar tablepar = new Tablepar();
+ tablepar.setIsAsc("asc");
+ tablepar.setPageNum(1);
+ tablepar.setPageSize(10);
+ Taskinfo record = new Taskinfo();
+ final PageInfo page=taskinfoService.listForAudiLeader(tablepar,record) ;
+ map.addAttribute("tasknum",page.getTotal());
+
+ return "taskmanage/controlForLeader";
+ }
/**
* 请求到登陆界面
- * @param request
+ * @param modelMap
* @return
*/
@ApiOperation(value="请求到登陆界面",notes="请求到登陆界面")
@@ -94,10 +205,10 @@ public class AdminController extends BaseController{
/**
* 用户登陆验证
* @param user
- * @param rcode
+ * @param code
* @param redirectAttributes
* @param rememberMe
- * @param model
+ * @param rememberMe
* @param request
* @return
*/
diff --git a/src/main/java/com/fc/test/controller/IndexController.java b/src/main/java/com/fc/test/controller/IndexController.java
index 895aff057344a412cf14d8b6afbad9189e9e8521..b233f4735c0ce0cc5ab1be89f5d8da9bd2d3e738 100644
--- a/src/main/java/com/fc/test/controller/IndexController.java
+++ b/src/main/java/com/fc/test/controller/IndexController.java
@@ -1,6 +1,7 @@
package com.fc.test.controller;
import com.fc.test.common.base.BaseController;
+import com.fc.test.common.conf.V2Config;
import com.fc.test.model.custom.TitleVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
@@ -28,7 +29,11 @@ public class IndexController extends BaseController{
public String index(ModelMap map) {
String str="前台";
setTitle(map, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
- return "index";
+// return "index"; // 进入前台空白页面
+ //通过参数 RollVerification, 控制登陆页面使用验证码方式,数字还是滑动效果
+ map.put("RollVerification", V2Config.getRollVerification());
+// System.out.println("V2Config.getRollVerification()>>>"+V2Config.getRollVerification());
+ return "login"; // 进入登陆页面
}
/**
* 前台访问/index的get请求
@@ -42,6 +47,7 @@ public class IndexController extends BaseController{
public String index2(ModelMap map) {
String str="前台";
setTitle(map, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
- return "index";
+// return "index";
+ return "login";
}
}
diff --git a/src/main/java/com/fc/test/controller/admin/AutoCodeController.java b/src/main/java/com/fc/test/controller/admin/AutoCodeController.java
index 1f50d3d1e8423e56ec9005dbb7a483c8e21623c4..0c9ad517851406d2d31910a6e2c33e7e677df368 100644
--- a/src/main/java/com/fc/test/controller/admin/AutoCodeController.java
+++ b/src/main/java/com/fc/test/controller/admin/AutoCodeController.java
@@ -72,7 +72,7 @@ public class AutoCodeController extends BaseController {
/**
* 代码自动生成全局配置
*
- * @param model
+ * @param modelMap
* @return
* @author fuce
* @Date 2019年8月13日 上午12:34:30
diff --git a/src/main/java/com/fc/test/controller/admin/FileController.java b/src/main/java/com/fc/test/controller/admin/FileController.java
index 8930c51c8ed4c60f7410c43f62dbc582256a0228..ca5df5f32da3d8a5f814b8accc47fb3c71955386 100644
--- a/src/main/java/com/fc/test/controller/admin/FileController.java
+++ b/src/main/java/com/fc/test/controller/admin/FileController.java
@@ -117,6 +117,38 @@ public class FileController extends BaseController{
return error(e.getMessage());
}
}
+
+ /**
+ * 文件上传
+ * @param file
+ * @return
+ * @author fuce
+ * @Date 2019年11月20日 下午10:18:49
+ */
+ //@Log(title = "文件上传", action = "1")
+ @ApiOperation(value = "文件上传", notes = "文件上传")
+ @PostMapping("/uploadFile")
+ @ResponseBody
+ public AjaxResult uploadFile(@RequestParam("file") MultipartFile file)
+ {
+ try
+ {
+ if (!file.isEmpty())
+ {
+ //插入文件存储表
+ String id=sysDatasService.insertSelective(file);
+// final String fileName = file.getOriginalFilename();
+ if(id!=null){
+ return AjaxResult.successData(200, id);
+ }
+ }
+ return error();
+ }
+ catch (Exception e)
+ {
+ return error(e.getMessage());
+ }
+ }
/**
* 文件添加
diff --git a/src/main/java/com/fc/test/controller/admin/SysDepartmentController.java b/src/main/java/com/fc/test/controller/admin/SysDepartmentController.java
index f0acf2b96cb1f086b4621662dac8e0c62267123f..92e319e880b54bebd172fb317253e6a498131442 100644
--- a/src/main/java/com/fc/test/controller/admin/SysDepartmentController.java
+++ b/src/main/java/com/fc/test/controller/admin/SysDepartmentController.java
@@ -1,6 +1,9 @@
package com.fc.test.controller.admin;
import java.util.List;
+
+import com.fc.test.model.auto.TsysUser;
+import com.fc.test.service.SysUserService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -21,6 +24,8 @@ import com.fc.test.service.SysDepartmentService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+
@Api(value = "部门表")
@Controller
@RequestMapping("/SysDepartmentController")
@@ -29,6 +34,8 @@ public class SysDepartmentController extends BaseController{
private String prefix = "admin/sysDepartment";
@Autowired
private SysDepartmentService sysDepartmentService;
+ @Resource
+ private SysUserService sysUserService;
/**
* 分页跳转
@@ -126,7 +133,7 @@ public class SysDepartmentController extends BaseController{
/**
* 检查用户
- * @param tsysUser
+ * @param sysDepartment
* @return
*/
@ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
@@ -153,14 +160,17 @@ public class SysDepartmentController extends BaseController{
public String edit(@PathVariable("id") String id, ModelMap mmap)
{
//获取自己的权限信息
- SysDepartment mytsysPermission = sysDepartmentService.selectByPrimaryKey(id);
+ SysDepartment mysysdepartment = sysDepartmentService.selectByPrimaryKey(id);
//获取父权限信息
- SysDepartment department = sysDepartmentService.selectByPrimaryKey(mytsysPermission.getParentId());
+ SysDepartment department = sysDepartmentService.selectByPrimaryKey(mysysdepartment.getParentId());
if(department==null) {
department=new SysDepartment(1, "", "顶级菜单", "", "", "", 0, 1, 1);
}
- mmap.put("SysDepartment", mytsysPermission);
+ mmap.put("SysDepartment", mysysdepartment);
mmap.put("perSysDepartment", department);
+ final Listusers = this.sysUserService.getUserlistByDeptid(Integer.valueOf(id));
+ mmap.put("userlist", users);
+
return prefix + "/edit";
}
@@ -182,7 +192,6 @@ public class SysDepartmentController extends BaseController{
* 根据主键查询
*
* @param id
- * @param mmap
* @return
*/
@PostMapping("/get/{id}")
diff --git a/src/main/java/com/fc/test/controller/admin/UserController.java b/src/main/java/com/fc/test/controller/admin/UserController.java
index e8e93370a95af9fe23ae7f5e2d986116370853e6..96122bf756710732ea300908696dcb8383400886 100644
--- a/src/main/java/com/fc/test/controller/admin/UserController.java
+++ b/src/main/java/com/fc/test/controller/admin/UserController.java
@@ -1,6 +1,8 @@
package com.fc.test.controller.admin;
import java.util.List;
+
+import com.fc.test.model.auto.SysDepartment;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -86,8 +88,10 @@ public class UserController extends BaseController{
public String add(ModelMap modelMap)
{
//添加角色列表
- List tsysRoleList=sysRoleService.queryList();
+ final List tsysRoleList=sysRoleService.queryList();
modelMap.put("tsysRoleList",tsysRoleList);
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList",deptList);
return prefix + "/add";
}
/**
@@ -161,10 +165,12 @@ public class UserController extends BaseController{
public String edit(@PathVariable("id") String id, ModelMap mmap)
{
//查询所有角色
- List roleVos=sysUserService.getUserIsRole(id);
+ final List roleVos=sysUserService.getUserIsRole(id);
mmap.put("roleVos",roleVos);
- mmap.put("TsysUser", sysUserService.selectByPrimaryKey(id));
-
+ final TsysUser user = sysUserService.selectByPrimaryKey(id);
+ mmap.put("TsysUser", user);
+ final List deptList = sysDepartmentService.getall();
+ mmap.put("deptList", deptList);
return prefix + "/edit";
}
diff --git a/src/main/java/com/fc/test/controller/gen/TestController.java b/src/main/java/com/fc/test/controller/gen/TestController.java
new file mode 100644
index 0000000000000000000000000000000000000000..7378cb95c96ea42690256b54a8b7033b9a66ea5c
--- /dev/null
+++ b/src/main/java/com/fc/test/controller/gen/TestController.java
@@ -0,0 +1,167 @@
+package com.fc.test.controller.gen;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.github.pagehelper.PageInfo;
+import com.fc.test.common.base.BaseController;
+import com.fc.test.common.domain.AjaxResult;
+import com.fc.test.model.auto.Test;
+import com.fc.test.model.custom.TableSplitResult;
+import com.fc.test.model.custom.Tablepar;
+import com.fc.test.model.custom.TitleVo;
+import com.fc.test.service.TestService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(value = "测试表")
+@Controller
+@RequestMapping("/TestController")
+public class TestController extends BaseController{
+
+ private String prefix = "gen/test";
+ @Autowired
+ private TestService testService;
+
+ /**
+ * 分页跳转
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/view")
+ @RequiresPermissions("gen:test:view")
+ public String view(ModelMap model)
+ {
+ String str="测试表";
+ setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
+ return prefix + "/list";
+ }
+
+ /**
+ * 分页查询
+ */
+ //@Log(title = "测试表集合查询", action = "111")
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/list")
+ @RequiresPermissions("gen:test:list")
+ @ResponseBody
+ public Object list(Tablepar tablepar,Test record){
+ PageInfo page=testService.list(tablepar,record) ;
+ TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ /**
+ * 新增跳转
+ */
+ @ApiOperation(value = "新增跳转", notes = "新增跳转")
+ @GetMapping("/add")
+ public String add(ModelMap modelMap)
+ {
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增
+ */
+ //@Log(title = "测试表新增", action = "111")
+ @ApiOperation(value = "新增", notes = "新增")
+ @PostMapping("/add")
+ @RequiresPermissions("gen:test:add")
+ @ResponseBody
+ public AjaxResult add(Test test){
+ int b=testService.insertSelective(test);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 删除
+ * @param ids
+ * @return
+ */
+ //@Log(title = "测试表删除", action = "111")
+ @ApiOperation(value = "删除", notes = "删除")
+ @PostMapping("/remove")
+ @RequiresPermissions("gen:test:remove")
+ @ResponseBody
+ public AjaxResult remove(String ids){
+ int b=testService.deleteByPrimaryKey(ids);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 检查Name
+ * @param tsysUser
+ * @return
+ */
+ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
+ @PostMapping("/checkNameUnique")
+ @ResponseBody
+ public int checkNameUnique(Test test){
+ int b=testService.checkNameUnique(test);
+ if(b>0){
+ return 1;
+ }else{
+ return 0;
+ }
+ }
+
+
+ /**
+ * 修改跳转
+ * @param id
+ * @param mmap
+ * @return
+ */
+ @ApiOperation(value = "修改跳转", notes = "修改跳转")
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") String id, ModelMap mmap)
+ {
+ mmap.put("Test", testService.selectByPrimaryKey(id));
+
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存
+ */
+ //@Log(title = "测试表修改", action = "111")
+ @ApiOperation(value = "修改保存", notes = "修改保存")
+ @RequiresPermissions("gen:test:edit")
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(Test record)
+ {
+ return toAjax(testService.updateByPrimaryKeySelective(record));
+ }
+
+
+ /**
+ * 根据主键查询
+ *
+ * @param id
+ * @param mmap
+ * @return
+ */
+ @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
+ @PostMapping("/get/{id}")
+ public Test edit(@PathVariable("id") String id) {
+ return testService.selectByPrimaryKey(id);
+ }
+
+
+
+}
diff --git a/src/main/java/com/fc/test/mapper/auto/SysDepartmentMapper.java b/src/main/java/com/fc/test/mapper/auto/SysDepartmentMapper.java
index cc3acf62dc145a197a6c18d63dba7d154be0d284..952fcb3dd32309e4e046be75720842a2d29accda 100644
--- a/src/main/java/com/fc/test/mapper/auto/SysDepartmentMapper.java
+++ b/src/main/java/com/fc/test/mapper/auto/SysDepartmentMapper.java
@@ -34,5 +34,5 @@ public interface SysDepartmentMapper {
int updateByPrimaryKeySelective(SysDepartment record);
int updateByPrimaryKey(SysDepartment record);
-
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/mapper/auto/TestMapper.java b/src/main/java/com/fc/test/mapper/auto/TestMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..f011385d43f76de0ba1c8f61d08d8bedff477d31
--- /dev/null
+++ b/src/main/java/com/fc/test/mapper/auto/TestMapper.java
@@ -0,0 +1,38 @@
+package com.fc.test.mapper.auto;
+
+import com.fc.test.model.auto.Test;
+import com.fc.test.model.auto.TestExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 测试表 TestMapper
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-03 13:09:35
+ */
+public interface TestMapper {
+
+ long countByExample(TestExample example);
+
+ int deleteByExample(TestExample example);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(Test record);
+
+ int insertSelective(Test record);
+
+ List selectByExample(TestExample example);
+
+ Test selectByPrimaryKey(String id);
+
+ int updateByExampleSelective(@Param("record") Test record, @Param("example") TestExample example);
+
+ int updateByExample(@Param("record") Test record, @Param("example") TestExample example);
+
+ int updateByPrimaryKeySelective(Test record);
+
+ int updateByPrimaryKey(Test record);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/mapper/custom/TsysDatasDao.java b/src/main/java/com/fc/test/mapper/custom/TsysDatasDao.java
index 35c936bd4f85fc978f6704577fb5d46461e41f9c..429970bc600db772dceb7e60e2c0df01902912d7 100644
--- a/src/main/java/com/fc/test/mapper/custom/TsysDatasDao.java
+++ b/src/main/java/com/fc/test/mapper/custom/TsysDatasDao.java
@@ -9,5 +9,26 @@ import com.fc.test.model.auto.TsysDatas;
public interface TsysDatasDao {
public List selectByPrimaryKeys(@Param("ids") List ids);
-
+
+ /**
+ * 通过任务管理附件id,获取文件数据信息。
+ * @param ids
+ * @return
+ */
+ public List selectByTaskfileids(@Param("ids") List ids);
+
+ /**
+ * 通过任务id taskid 获取所有的文件数据信息.
+ * @param taskid
+ * @return
+ */
+ public List selectByTaskid(@Param("taskid") String taskid);
+
+ /**
+ * 通过任务id taskid 获取指定附件类型的文件数据信息.
+ * @param taskid
+ * @param filetype 附件类型, 0任务信息;1任务汇报
+ * @return
+ */
+ public List getTaskFileByTaskidAndFiletype(@Param("taskid") String taskid, @Param("filetype") Integer filetype);
}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/model/auto/Test.java b/src/main/java/com/fc/test/model/auto/Test.java
new file mode 100644
index 0000000000000000000000000000000000000000..f6118d227ebd4c4b1c736bf76c9b924f74ff53e4
--- /dev/null
+++ b/src/main/java/com/fc/test/model/auto/Test.java
@@ -0,0 +1,105 @@
+package com.fc.test.model.auto;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.lang.Integer;
+
+/**
+ * 测试表 Test
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-03 13:09:35
+ */
+ @ApiModel(value="Test", description="测试表")
+public class Test implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /** 主键 **/
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ /** 名称 **/
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /** 年龄 **/
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /** 创建时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "创建时间")
+ private Date crateTime;
+
+ /** 别名 **/
+ @ApiModelProperty(value = "别名")
+ private String tesName;
+
+
+ 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 Integer getAge() {
+ return age;
+ }
+
+ public void setAge(Integer age) {
+ this.age = age;
+ }
+
+
+ public Date getCrateTime() {
+ return crateTime;
+ }
+
+ public void setCrateTime(Date crateTime) {
+ this.crateTime = crateTime;
+ }
+
+
+ public String getTesName() {
+ return tesName;
+ }
+
+ public void setTesName(String tesName) {
+ this.tesName = tesName;
+ }
+
+
+ public Test() {
+ super();
+ }
+
+
+ public Test(String id,String name,Integer age,Date crateTime,String tesName) {
+
+ this.id = id;
+ this.name = name;
+ this.age = age;
+ this.crateTime = crateTime;
+ this.tesName = tesName;
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/model/auto/TestExample.java b/src/main/java/com/fc/test/model/auto/TestExample.java
new file mode 100644
index 0000000000000000000000000000000000000000..882a285fbf3519e6b74b08a3b02a5cc10b5ef9ef
--- /dev/null
+++ b/src/main/java/com/fc/test/model/auto/TestExample.java
@@ -0,0 +1,615 @@
+package com.fc.test.model.auto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import cn.hutool.core.util.StrUtil;
+/**
+ * 测试表 TestExample
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-03 13:09:35
+ */
+public class TestExample {
+
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List oredCriteria;
+
+ public TestExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(String value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(String value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(String value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(String value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(String value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(String value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLike(String value) {
+ addCriterion("id like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotLike(String value) {
+ addCriterion("id not like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(String value1, String value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(String value1, String value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andNameIsNull() {
+ addCriterion("name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIsNotNull() {
+ addCriterion("name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameEqualTo(String value) {
+ addCriterion("name =", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotEqualTo(String value) {
+ addCriterion("name <>", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThan(String value) {
+ addCriterion("name >", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThanOrEqualTo(String value) {
+ addCriterion("name >=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThan(String value) {
+ addCriterion("name <", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThanOrEqualTo(String value) {
+ addCriterion("name <=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLike(String value) {
+ addCriterion("name like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotLike(String value) {
+ addCriterion("name not like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIn(List values) {
+ addCriterion("name in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotIn(List values) {
+ addCriterion("name not in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameBetween(String value1, String value2) {
+ addCriterion("name between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotBetween(String value1, String value2) {
+ addCriterion("name not between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andAgeIsNull() {
+ addCriterion("age is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeIsNotNull() {
+ addCriterion("age is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeEqualTo(Integer value) {
+ addCriterion("age =", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeNotEqualTo(Integer value) {
+ addCriterion("age <>", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeGreaterThan(Integer value) {
+ addCriterion("age >", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeGreaterThanOrEqualTo(Integer value) {
+ addCriterion("age >=", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeLessThan(Integer value) {
+ addCriterion("age <", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeLessThanOrEqualTo(Integer value) {
+ addCriterion("age <=", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeLike(Integer value) {
+ addCriterion("age like", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeNotLike(Integer value) {
+ addCriterion("age not like", value, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeIn(List values) {
+ addCriterion("age in", values, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeNotIn(List values) {
+ addCriterion("age not in", values, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeBetween(Integer value1, Integer value2) {
+ addCriterion("age between", value1, value2, "age");
+ return (Criteria) this;
+ }
+
+ public Criteria andAgeNotBetween(Integer value1, Integer value2) {
+ addCriterion("age not between", value1, value2, "age");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCrateTimeIsNull() {
+ addCriterion("crate_time is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeIsNotNull() {
+ addCriterion("crate_time is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeEqualTo(Date value) {
+ addCriterion("crate_time =", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeNotEqualTo(Date value) {
+ addCriterion("crate_time <>", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeGreaterThan(Date value) {
+ addCriterion("crate_time >", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("crate_time >=", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeLessThan(Date value) {
+ addCriterion("crate_time <", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeLessThanOrEqualTo(Date value) {
+ addCriterion("crate_time <=", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeLike(Date value) {
+ addCriterion("crate_time like", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeNotLike(Date value) {
+ addCriterion("crate_time not like", value, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeIn(List values) {
+ addCriterion("crate_time in", values, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeNotIn(List values) {
+ addCriterion("crate_time not in", values, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeBetween(Date value1, Date value2) {
+ addCriterion("crate_time between", value1, value2, "crateTime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCrateTimeNotBetween(Date value1, Date value2) {
+ addCriterion("crate_time not between", value1, value2, "crateTime");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andTesNameIsNull() {
+ addCriterion("tes_name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameIsNotNull() {
+ addCriterion("tes_name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameEqualTo(String value) {
+ addCriterion("tes_name =", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameNotEqualTo(String value) {
+ addCriterion("tes_name <>", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameGreaterThan(String value) {
+ addCriterion("tes_name >", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameGreaterThanOrEqualTo(String value) {
+ addCriterion("tes_name >=", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameLessThan(String value) {
+ addCriterion("tes_name <", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameLessThanOrEqualTo(String value) {
+ addCriterion("tes_name <=", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameLike(String value) {
+ addCriterion("tes_name like", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameNotLike(String value) {
+ addCriterion("tes_name not like", value, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameIn(List values) {
+ addCriterion("tes_name in", values, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameNotIn(List values) {
+ addCriterion("tes_name not in", values, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameBetween(String value1, String value2) {
+ addCriterion("tes_name between", value1, value2, "tesName");
+ return (Criteria) this;
+ }
+
+ public Criteria andTesNameNotBetween(String value1, String value2) {
+ addCriterion("tes_name not between", value1, value2, "tesName");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andLikeQuery(Test record) {
+ List list= new ArrayList();
+ List list2= new ArrayList();
+ StringBuffer buffer=new StringBuffer();
+
+ if(record.getId()!=null&&StrUtil.isNotEmpty(record.getId().toString())) {
+ list.add("ifnull(id,'')");
+ }
+ if(record.getName()!=null&&StrUtil.isNotEmpty(record.getName().toString())) {
+ list.add("ifnull(name,'')");
+ }
+ if(record.getAge()!=null&&StrUtil.isNotEmpty(record.getAge().toString())) {
+ list.add("ifnull(age,'')");
+ }
+ if(record.getCrateTime()!=null&&StrUtil.isNotEmpty(record.getCrateTime().toString())) {
+ list.add("ifnull(crate_time,'')");
+ }
+ if(record.getTesName()!=null&&StrUtil.isNotEmpty(record.getTesName().toString())) {
+ list.add("ifnull(tes_name,'')");
+ }
+ if(record.getId()!=null&&StrUtil.isNotEmpty(record.getId().toString())) {
+ list2.add("'%"+record.getId()+"%'");
+ }
+ if(record.getName()!=null&&StrUtil.isNotEmpty(record.getName().toString())) {
+ list2.add("'%"+record.getName()+"%'");
+ }
+ if(record.getAge()!=null&&StrUtil.isNotEmpty(record.getAge().toString())) {
+ list2.add("'%"+record.getAge()+"%'");
+ }
+ if(record.getCrateTime()!=null&&StrUtil.isNotEmpty(record.getCrateTime().toString())) {
+ list2.add("'%"+record.getCrateTime()+"%'");
+ }
+ if(record.getTesName()!=null&&StrUtil.isNotEmpty(record.getTesName().toString())) {
+ list2.add("'%"+record.getTesName()+"%'");
+ }
+
+ buffer.append(" CONCAT(");
+ buffer.append(StrUtil.join("",list));
+ buffer.append(")");
+ buffer.append("like CONCAT(");
+
+
+ buffer.append(StrUtil.join("",list2));
+
+ buffer.append(")");
+ if(!" CONCAT()like CONCAT()".equals(buffer.toString())) {
+ addCriterion(buffer.toString());
+ }
+ return (Criteria) this;
+ }
+
+}
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/model/auto/TsysDatas.java b/src/main/java/com/fc/test/model/auto/TsysDatas.java
index 813e3050dccc5c8d21ee1ad0dca3ac84b302342b..cf1d2367ee500cf87cf4b4ed6aba279b288592a8 100644
--- a/src/main/java/com/fc/test/model/auto/TsysDatas.java
+++ b/src/main/java/com/fc/test/model/auto/TsysDatas.java
@@ -13,15 +13,19 @@ public class TsysDatas implements Serializable {
private String fileSuffix;
/**Y 项目目录,N盘符目录 **/
private String fileType;
-
+ /**
+ * 原文件名称.
+ */
+ private String fileOrginName;
private static final long serialVersionUID = 1L;
- public TsysDatas(String id, String filePath, String fileAbsolutePath, String fileSuffix, String fileType) {
+ public TsysDatas(String id, String filePath, String fileAbsolutePath, String fileSuffix, String fileType, String fileOrginName) {
this.id = id;
this.filePath = filePath;
this.fileAbsolutePath = fileAbsolutePath;
this.fileSuffix = fileSuffix;
this.fileType = fileType;
+ this.fileOrginName = fileOrginName;
}
public TsysDatas() {
@@ -67,4 +71,12 @@ public class TsysDatas implements Serializable {
public void setFileType(String fileType) {
this.fileType = fileType == null ? null : fileType.trim();
}
-}
\ No newline at end of file
+
+ public String getFileOrginName() {
+ return fileOrginName;
+ }
+
+ public void setFileOrginName(String fileOrginName) {
+ this.fileOrginName = fileOrginName;
+ }
+}
diff --git a/src/main/java/com/fc/test/model/auto/TsysRole.java b/src/main/java/com/fc/test/model/auto/TsysRole.java
index 5ec8c484635f87bb14e682a75d6fd6bc1aca95c4..3fc5a1c40f9c85accc3cd686999f543fdb2119e5 100644
--- a/src/main/java/com/fc/test/model/auto/TsysRole.java
+++ b/src/main/java/com/fc/test/model/auto/TsysRole.java
@@ -7,6 +7,8 @@ public class TsysRole implements Serializable {
private String name;
+ private Integer order;
+
private static final long serialVersionUID = 1L;
public String getId() {
@@ -25,14 +27,28 @@ public class TsysRole implements Serializable {
this.name = name == null ? null : name.trim();
}
- public TsysRole(String id, String name) {
+ public TsysRole(String id, String name) {
+ super();
+ this.id = id;
+ this.name = name;
+ }
+
+ public TsysRole(String id, String name, Integer order) {
super();
this.id = id;
this.name = name;
+ this.order = order;
}
public TsysRole() {
super();
}
-
+
+ public Integer getOrder() {
+ return order;
+ }
+
+ public void setOrder(Integer order) {
+ this.order = order;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/model/auto/TsysUser.java b/src/main/java/com/fc/test/model/auto/TsysUser.java
index 1fe95816570834c2ed93ac72aabb94162d1eefdf..2f643deccbda5366404ce0b4defdcfe9668b711b 100644
--- a/src/main/java/com/fc/test/model/auto/TsysUser.java
+++ b/src/main/java/com/fc/test/model/auto/TsysUser.java
@@ -10,14 +10,21 @@ public class TsysUser implements Serializable {
private String password;
private String nickname;
+ /**
+ * 部门id.
+ */
+ private Integer deptid;
+
+ private String deptName;
private static final long serialVersionUID = 1L;
- public TsysUser(String id, String username, String password, String nickname) {
+ public TsysUser(String id, String username, String password, String nickname, Integer deptid) {
this.id = id;
this.username = username;
this.password = password;
this.nickname = nickname;
+ this.deptid = deptid;
}
public TsysUser() {
@@ -55,4 +62,32 @@ public class TsysUser implements Serializable {
public void setNickname(String nickname) {
this.nickname = nickname == null ? null : nickname.trim();
}
+
+ /**
+ * @param deptid
+ */
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ /**
+ * @return
+ */
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ /**
+ * @return
+ */
+ public String getDeptName() {
+ return deptName;
+ }
+
+ /**
+ * @param deptName
+ */
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/fc/test/model/auto/TsysUserExample.java b/src/main/java/com/fc/test/model/auto/TsysUserExample.java
index 2c7e8ad8f3a55f1502e7f3c84c05f76aa5e7fd7c..6dd3bd8e7dc025255af0828302033f4419af2298 100644
--- a/src/main/java/com/fc/test/model/auto/TsysUserExample.java
+++ b/src/main/java/com/fc/test/model/auto/TsysUserExample.java
@@ -383,6 +383,11 @@ public class TsysUserExample {
addCriterion("nickname not between", value1, value2, "nickname");
return (Criteria) this;
}
+
+ public Criteria andDeptidEqualTo(Integer value) {
+ addCriterion("deptid =", value, "deptid");
+ return (Criteria) this;
+ }
}
public static class Criteria extends GeneratedCriteria {
diff --git a/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java b/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java
index 5f1a9dea4dad4a495ac1f970d901390b418b460b..511e6e18a6240b6483c0c875b6571d2f82d64301 100644
--- a/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java
+++ b/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java
@@ -24,11 +24,27 @@ public class AutoCodeConfig {
static {
configuration=getConfig();
-
-
-
- globalConfig =new GlobalConfig(null, configuration.getString("parentPack"), configuration.getString("parentPath"),configuration.getBoolean("cover"),
- configuration.getBoolean("swagger"),configuration.getString("javaSource"),configuration.getString("resources"),configuration.getString("xmlPath"),configuration.getString("packageBean"),configuration.getString("packageDao"),configuration.getString("packageController"), configuration.getString("packageService"), configuration.getString("tablePrefix"),configuration.getBoolean("autoCode"), configuration.getBoolean("watchMobel"),configuration.getString("author"),configuration.getString("email"));
+ final String parentPack = configuration.getString("parentPack");
+ final String parentPath = configuration.getString("parentPath");
+ final Boolean cover = configuration.getBoolean("cover");
+ final Boolean swagger = configuration.getBoolean("swagger");
+ final String javaSource = configuration.getString("javaSource");
+ final String resources = configuration.getString("resources");
+ final String xmlPath = configuration.getString("xmlPath");
+ final String packageBean = configuration.getString("packageBean");
+ final String packageDao = configuration.getString("packageDao");
+ final String packageController = configuration.getString("packageController");
+ final String packageService = configuration.getString("packageService");
+ final String tablePrefix = configuration.getString("tablePrefix");
+ final Boolean autoCode = configuration.getBoolean("autoCode");
+ final Boolean watchMobel = configuration.getBoolean("watchMobel");
+ final String author = configuration.getString("author");
+ final String email = configuration.getString("email");
+ globalConfig =new GlobalConfig(null, parentPack, parentPath,cover,
+ swagger,javaSource,resources,xmlPath,
+ packageBean,packageDao,packageController,
+ packageService,tablePrefix,autoCode,
+ watchMobel,author,email);
}
public AutoCodeConfig() {
super();
@@ -41,7 +57,10 @@ public class AutoCodeConfig {
*/
public static Configuration getConfig() {
try {
- return new PropertiesConfiguration("auto_code/auto_code_config.properties" );
+ final PropertiesConfiguration proCfing = new PropertiesConfiguration();
+ proCfing.setEncoding("UTF-8");
+ proCfing.load("auto_code/auto_code_config.properties");
+ return proCfing;
} catch (ConfigurationException e) {
System.out.println("获取配置文件失败");
e.printStackTrace();
diff --git a/src/main/java/com/fc/test/service/SysDatasService.java b/src/main/java/com/fc/test/service/SysDatasService.java
index eef6c61ec28602174de32c40d58e7fb9eb2f3aef..8eff68e50c5248f17ba0bbe4e8f13c0d7a77170f 100644
--- a/src/main/java/com/fc/test/service/SysDatasService.java
+++ b/src/main/java/com/fc/test/service/SysDatasService.java
@@ -80,9 +80,14 @@ public class SysDatasService implements BaseService
//filesURL=V2Config.getIsroot_dir()+files;
}
- String fileName=file.getOriginalFilename();
+ final String fileName=file.getOriginalFilename();
// 获得文件后缀名称
- String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase();
+ final int index = fileName.lastIndexOf(".");
+ String suffixName = null;
+ if (index > 0) {
+ suffixName = fileName.substring(index).toLowerCase();
+ }
+// String suffixName = fileName.substring(fileName.lastIndexOf(".")).toLowerCase();
if(StringUtils.isEmpty(suffixName)) {
//如果没有后缀默认后缀
suffixName=FileUploadUtils.IMAGE_JPG_EXTENSION;
@@ -94,6 +99,7 @@ public class SysDatasService implements BaseService
record.setFilePath(relative_filesURL);
record.setFileAbsolutePath(absolute_filesURL);
record.setFileSuffix(suffixName);
+ record.setFileOrginName(fileName);
//上传路径类型
record.setFileType(V2Config.getIsstatic());
if(tsysDatasMapper.insertSelective(record)>0)
diff --git a/src/main/java/com/fc/test/service/SysDepartmentService.java b/src/main/java/com/fc/test/service/SysDepartmentService.java
index a26699d3acb031429650508065509408883c0c5c..b282530a0c593d19d0c5086db6bbfa4e203069c7 100644
--- a/src/main/java/com/fc/test/service/SysDepartmentService.java
+++ b/src/main/java/com/fc/test/service/SysDepartmentService.java
@@ -17,6 +17,8 @@ import com.fc.test.model.custom.BootstrapTree;
import com.fc.test.model.custom.Tablepar;
import com.fc.test.util.StringUtils;
+import javax.annotation.Resource;
+
/**
* 部门表 SysDepartmentService
*
@@ -28,14 +30,14 @@ import com.fc.test.util.StringUtils;
**/
@Service
public class SysDepartmentService implements BaseService {
- @Autowired
+ @Resource
private SysDepartmentMapper sysDepartmentMapper;
/**
* 分页查询
*
- * @param pageNum
- * @param pageSize
+ * @param tablepar
+ * @param name
* @return
*/
public PageInfo list(Tablepar tablepar, String name) {
@@ -187,10 +189,22 @@ public class SysDepartmentService implements BaseService getall(){
- SysDepartmentExample example = new SysDepartmentExample();
+ final SysDepartmentExample example = new SysDepartmentExample();
example.setOrderByClause("order_num asc");
return sysDepartmentMapper.selectByExample(example);
}
+
+ /**
+ * 获取
+ * @return
+ */
+ public List getDeptsWithoutRoot() {
+ final SysDepartmentExample example = new SysDepartmentExample();
+ example.createCriteria().andParentIdNotEqualTo("0");
+ example.setOrderByClause("order_num asc");
+ final List result = sysDepartmentMapper.selectByExample(example);
+ return result;
+ }
}
diff --git a/src/main/java/com/fc/test/service/SysUserService.java b/src/main/java/com/fc/test/service/SysUserService.java
index 9a6efbc29a3b83fb8bafbe551e6d28fe132c5578..d04670768baa661edfff4a0ac2437b6c0ceb6af3 100644
--- a/src/main/java/com/fc/test/service/SysUserService.java
+++ b/src/main/java/com/fc/test/service/SysUserService.java
@@ -25,6 +25,8 @@ import com.fc.test.util.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import javax.annotation.Resource;
+
/**
* 系统用户
* @ClassName: SysUserService
@@ -35,30 +37,32 @@ import com.github.pagehelper.PageInfo;
@Service
public class SysUserService implements BaseService{
//生成的用户dao
- @Autowired
+ @Resource
private TsysUserMapper tsysUserMapper;
//生成的角色用户dao
- @Autowired
+ @Resource
private TSysRoleUserMapper tSysRoleUserMapper;
//自定义角色dao
- @Autowired
+ @Resource
private RoleDao roleDao;
//自动生成的角色dao
- @Autowired
+ @Resource
private TsysRoleMapper tsysRoleMapper;
-
+
+
+
/**
* 分页查询
- * @param pageNum
- * @param pageSize
+ * @param tablepar
+ * @param username
* @return
*/
public PageInfo list(Tablepar tablepar,String username){
TsysUserExample testExample=new TsysUserExample();
- testExample.setOrderByClause("id+0 DESC");
+ testExample.setOrderByClause("a.id+0 DESC");
if(username!=null&&!"".equals(username)){
testExample.createCriteria().andUsernameLike("%"+username+"%");
}
@@ -157,7 +161,21 @@ public class SysUserService implements BaseService{
return tsysUserMapper.deleteByExample(example);
}
-
+
+ /**
+ * 根据部门id获取用户信息.
+ * @param deptid
+ * @return
+ */
+ public List getUserlistByDeptid(Integer deptid) {
+ final TsysUserExample example = new TsysUserExample();
+ if(null != deptid) {
+ example.createCriteria().andDeptidEqualTo(deptid);
+ }
+ final List list = tsysUserMapper.selectByExample(example);
+ return list;
+ }
+
/**
* 检查用户name
* @param tsysUser
diff --git a/src/main/java/com/fc/test/service/TestService.java b/src/main/java/com/fc/test/service/TestService.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc93cfd7950d9f2e6ce47bdedf6f0ee45bf6075a
--- /dev/null
+++ b/src/main/java/com/fc/test/service/TestService.java
@@ -0,0 +1,138 @@
+package com.fc.test.service;
+
+import java.util.List;
+import java.util.Arrays;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import cn.hutool.core.util.StrUtil;
+import com.fc.test.common.base.BaseService;
+import com.fc.test.common.support.ConvertUtil;
+import com.fc.test.mapper.auto.TestMapper;
+import com.fc.test.model.auto.Test;
+import com.fc.test.model.auto.TestExample;
+import com.fc.test.model.custom.Tablepar;
+import com.fc.test.util.SnowflakeIdWorker;
+import com.fc.test.util.StringUtils;
+
+/**
+ * 测试表 TestService
+ * @Title: TestService.java
+ * @Package com.fc.test.service
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-03 13:09:35
+ **/
+@Service
+public class TestService implements BaseService{
+ @Autowired
+ private TestMapper testMapper;
+
+
+ /**
+ * 分页查询
+ * @param pageNum
+ * @param pageSize
+ * @return
+ */
+ public PageInfo list(Tablepar tablepar,Test record){
+ TestExample testExample=new TestExample();
+ testExample.createCriteria().andLikeQuery(record);
+ testExample.setOrderByClause("id ASC");
+ if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) {
+ testExample.setOrderByClause(StringUtils.toUnderScoreCase(tablepar.getOrderByColumn()) +" "+tablepar.getIsAsc());
+ }
+ PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+ List list= testMapper.selectByExample(testExample);
+ PageInfo pageInfo = new PageInfo(list);
+ return pageInfo;
+ }
+
+ @Override
+ public int deleteByPrimaryKey(String ids) {
+
+ List lista=ConvertUtil.toListStrArray(ids);
+ TestExample example=new TestExample();
+ example.createCriteria().andIdIn(lista);
+ return testMapper.deleteByExample(example);
+
+
+ }
+
+
+ @Override
+ public Test selectByPrimaryKey(String id) {
+
+ return testMapper.selectByPrimaryKey(id);
+
+ }
+
+
+ @Override
+ public int updateByPrimaryKeySelective(Test record) {
+ return testMapper.updateByPrimaryKeySelective(record);
+ }
+
+
+ /**
+ * 添加
+ */
+ @Override
+ public int insertSelective(Test record) {
+
+ //添加雪花主键id
+ record.setId(SnowflakeIdWorker.getUUID());
+
+
+ return testMapper.insertSelective(record);
+ }
+
+
+ @Override
+ public int updateByExampleSelective(Test record, TestExample example) {
+
+ return testMapper.updateByExampleSelective(record, example);
+ }
+
+
+ @Override
+ public int updateByExample(Test record, TestExample example) {
+
+ return testMapper.updateByExample(record, example);
+ }
+
+ @Override
+ public List selectByExample(TestExample example) {
+
+ return testMapper.selectByExample(example);
+ }
+
+
+ @Override
+ public long countByExample(TestExample example) {
+
+ return testMapper.countByExample(example);
+ }
+
+
+ @Override
+ public int deleteByExample(TestExample example) {
+
+ return testMapper.deleteByExample(example);
+ }
+
+ /**
+ * 检查name
+ * @param test
+ * @return
+ */
+ public int checkNameUnique(Test test){
+ TestExample example=new TestExample();
+ example.createCriteria().andNameEqualTo(test.getName());
+ List list=testMapper.selectByExample(example);
+ return list.size();
+ }
+
+
+}
diff --git a/src/main/java/com/zsess/taskmanage/controller/ControlindexController.java b/src/main/java/com/zsess/taskmanage/controller/ControlindexController.java
new file mode 100644
index 0000000000000000000000000000000000000000..9a320fd193e571f24f5c30ffdeacacd63a962d5e
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/controller/ControlindexController.java
@@ -0,0 +1,66 @@
+package com.zsess.taskmanage.controller;
+
+import com.fc.test.model.auto.TsysUser;
+import com.fc.test.shiro.util.ShiroUtils;
+import com.zsess.taskmanage.model.DeptTaskInfo;
+import com.zsess.taskmanage.service.DeptTaskInfoService;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Api(value = "控制面板控制器")
+@Controller
+@RequestMapping("/control")
+public class ControlindexController {
+ private static Logger logger= LoggerFactory.getLogger(ControlindexController.class);
+ @Resource
+ private DeptTaskInfoService deptTaskInfoService;
+
+ //显示任务统计模块数据
+ @RequestMapping("/counttasknum")
+ @ResponseBody
+ public Object getCompleteTasknum(HttpServletResponse response) throws IOException {
+ final List taskCompList = this.deptTaskInfoService.getDeptTaskCompleteNum();
+ return taskCompList;
+ }
+
+ //显示本周的每天的记录
+ @RequestMapping("/countweeklogin")
+ @ResponseBody
+ public Object getDaynumForWeek(HttpServletResponse response) throws IOException{
+ Integer []r=new Integer[7];
+// Calendar calendar=Calendar.getInstance();
+// setToFirstDay(calendar);
+ for (int i = 0; i < 7; i++) {
+// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+// r[i]=userLogRecordDao.countlog(sdf.format(calendar.getTime()));
+// calendar.add(Calendar.DATE, 1);
+ r[i]= i*2;
+ }
+ return r;
+ }
+
+ //日历的数据显示
+ @RequestMapping("/littlecalendar")
+ @ResponseBody
+ public Object getlittlecalendar(HttpSession session, HttpServletResponse response) throws IOException {
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+ final TsysUser user = ShiroUtils.getUser();
+ final String str_userid = user.getId();
+ long userid=Long.valueOf(str_userid);
+ final List list=new ArrayList<>();
+ list.add(sdf.format(new Date()));
+ return list;
+ }
+
+}
diff --git a/src/main/java/com/zsess/taskmanage/controller/TaskManageComControl.java b/src/main/java/com/zsess/taskmanage/controller/TaskManageComControl.java
new file mode 100644
index 0000000000000000000000000000000000000000..23da2faf672dc2dd29087efe7b3025a1b313a857
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/controller/TaskManageComControl.java
@@ -0,0 +1,52 @@
+package com.zsess.taskmanage.controller;
+
+import com.zsess.taskmanage.model.common.CommonIdNameBo;
+import com.zsess.taskmanage.service.TaskManageComService;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(value = "控制面板控制器")
+@Controller
+@RequestMapping("/taskManageComControl")
+public class TaskManageComControl {
+
+ private static Logger logger = LoggerFactory.getLogger(TaskManageComControl.class);
+
+ @Resource(name = "taskManageComService")
+ private TaskManageComService comService;
+ /**
+ * 获取任务状态数据post 接口.
+ */
+ @PostMapping("/getTaskComIdNameMap")
+ @ResponseBody
+ public Map getTaskComIdNameMap(ModelMap modelMap)
+ {
+
+ final Map idNameMap = new HashMap();
+ final List taskStatusList = this.comService.getTaskStatusList();
+ final Map statusMap = new HashMap();
+ for(CommonIdNameBo bo : taskStatusList) {
+ statusMap.put(bo.getId(),bo.getName());
+ }
+ idNameMap.put("statusMap",statusMap);
+ final List taskFreqList = this.comService.getTaskFreqList();
+ final Map taskFreqMap = new HashMap();
+ for(CommonIdNameBo bo : taskFreqList) {
+ taskFreqMap.put(bo.getId(),bo.getName());
+ }
+ idNameMap.put("taskFreqMap",taskFreqMap);
+ return idNameMap;
+ }
+
+}
diff --git a/src/main/java/com/zsess/taskmanage/controller/TaskfileInfoController.java b/src/main/java/com/zsess/taskmanage/controller/TaskfileInfoController.java
new file mode 100644
index 0000000000000000000000000000000000000000..fa940e9c4c57d6d03cc3426564bfe9ace42ed861
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/controller/TaskfileInfoController.java
@@ -0,0 +1,302 @@
+package com.zsess.taskmanage.controller;
+
+import com.fc.test.common.base.BaseController;
+import com.fc.test.common.domain.AjaxResult;
+import com.fc.test.model.auto.TsysDatas;
+import com.fc.test.model.auto.TsysFile;
+import com.fc.test.model.custom.TableSplitResult;
+import com.fc.test.model.custom.Tablepar;
+import com.fc.test.model.custom.TitleVo;
+import com.fc.test.util.StringUtils;
+import com.zsess.taskmanage.model.TaskfileInfo;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.github.pagehelper.PageInfo;
+import com.zsess.taskmanage.service.TaskfileInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(value = "任务管理附件信息表")
+@Controller
+@RequestMapping("/TaskfileInfoController")
+public class TaskfileInfoController extends BaseController {
+ private static Logger logger = LoggerFactory.getLogger(TaskfileInfoController.class);
+ private String prefix = "taskmanage/taskfileInfo";
+ @Resource
+ private TaskfileInfoService taskfileInfoService;
+
+ /**
+ * 分页跳转
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/view")
+ @RequiresPermissions("gen:taskfileInfo:view")
+ public String view(ModelMap model)
+ {
+ String str="任务管理附件信息表";
+ setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
+ return prefix + "/list";
+ }
+
+ /**
+ * 分页查询
+ */
+ //@Log(title = "任务管理附件信息表集合查询", action = "111")
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/list")
+ @RequiresPermissions("gen:taskfileInfo:list")
+ @ResponseBody
+ public Object list(Tablepar tablepar, TaskfileInfo record){
+ PageInfo page=taskfileInfoService.list(tablepar,record) ;
+ TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ /**
+ * 新增跳转
+ */
+ @ApiOperation(value = "新增跳转", notes = "新增跳转")
+ @GetMapping("/add")
+ public String add(ModelMap modelMap)
+ {
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增
+ */
+ @ApiOperation(value = "新增", notes = "新增")
+ @PostMapping("/add")
+// @RequiresPermissions("gen:taskfileInfo:add")
+ @ResponseBody
+ public AjaxResult add(TaskfileInfo taskfileInfo){
+ int b=taskfileInfoService.insertSelective(taskfileInfo);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 删除
+ * @param ids
+ * @return
+ */
+ //@Log(title = "任务管理附件信息表删除", action = "111")
+ @ApiOperation(value = "删除", notes = "删除")
+ @PostMapping("/remove")
+ @RequiresPermissions("gen:taskfileInfo:remove")
+ @ResponseBody
+ public AjaxResult remove(String ids){
+
+ int b=taskfileInfoService.deleteByPrimaryKey(ids);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 检查Name
+ * @param taskfileInfo
+ * @return
+ */
+ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
+ @PostMapping("/checkNameUnique")
+ @ResponseBody
+ public int checkNameUnique(TaskfileInfo taskfileInfo){
+ int b=taskfileInfoService.checkNameUnique(taskfileInfo);
+ if(b>0){
+ return 1;
+ }else{
+ return 0;
+ }
+ }
+
+
+ /**
+ * 修改跳转
+ * @param id
+ * @param mmap
+ * @return
+ */
+ @ApiOperation(value = "修改跳转", notes = "修改跳转")
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") String id, ModelMap mmap)
+ {
+ mmap.put("TaskfileInfo", taskfileInfoService.selectByPrimaryKey(id));
+
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存
+ */
+ //@Log(title = "任务管理附件信息表修改", action = "111")
+ @ApiOperation(value = "修改保存", notes = "修改保存")
+ @RequiresPermissions("gen:taskfileInfo:edit")
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(TaskfileInfo record)
+ {
+ return toAjax(taskfileInfoService.updateByPrimaryKeySelective(record));
+ }
+
+
+ /**
+ * 根据主键查询
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
+ @PostMapping("/get/{id}")
+ public TaskfileInfo edit(@PathVariable("id") String id) {
+ return taskfileInfoService.selectByPrimaryKey(id);
+ }
+
+ /**
+ * 文件列表
+ * @param tablepar
+ * @param selfSearch 搜索字符
+ * @return
+ */
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/taskFilelist")
+// @RequiresPermissions("system:file:list")
+ @ResponseBody
+ public Object taskFilelist(Tablepar tablepar,String selfSearch){
+ final String taskid = selfSearch;
+ final PageInfo page=taskfileInfoService.getPageListByTaskid(tablepar,taskid) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+
+ }
+
+ /**
+ * 文件列表
+ * @param tablepar
+ * @param selfSearch 搜索字符
+ * @return
+ */
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/taskPorcessFilelist")
+// @RequiresPermissions("system:file:list")
+ @ResponseBody
+ public Object taskPorcessFilelist(Tablepar tablepar,String selfSearch){
+ final String taskid = selfSearch;
+ final PageInfo page=taskfileInfoService.getPageListOftaskProcessFileByTaskid(tablepar,taskid) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+
+ }
+
+ /**
+ * 新增附件跳转
+ * @param taskid
+ * @param mmap
+ * @return
+ */
+ @GetMapping("/addfile/{taskid}/{filetype}")
+ public String addfile(@PathVariable("taskid") String taskid, @PathVariable("filetype") Integer filetype, ModelMap mmap)
+ {
+ mmap.put("taskid", taskid);
+ mmap.put("filetype", filetype);
+// mmap.put("TaskfileInfo", taskfileInfoService.selectByPrimaryKey(id));
+
+ return prefix + "/addfile";
+ }
+
+ /**
+ * 文件添加
+ * @param taskfileInfo
+ * @param dataId
+ * @return
+ */
+ //@Log(title = "文件添加", action = "1")
+ @ApiOperation(value = "文件添加", notes = "文件添加")
+ @PostMapping("/addfile")
+// @RequiresPermissions("system:file:add")
+ @ResponseBody
+ public AjaxResult addfile(TaskfileInfo taskfileInfo,String dataId){
+ if(StringUtils.isNotEmpty(dataId)) {
+// taskfileInfo.setFiletype(0);
+ int b=taskfileInfoService.insertSelective(taskfileInfo, dataId);
+ if(b>0){
+ return success();
+ }else{
+ return error("请上传文件");
+ }
+ }
+ return error("请上传文件");
+ }
+ /**
+ * 任務執行過程文件添加
+ * @param taskfileInfo
+ * @param dataId
+ * @return
+ */
+ //@Log(title = "文件添加", action = "1")
+ @ApiOperation(value = "文件添加", notes = "文件添加")
+ @PostMapping("/addtaskProcessFile")
+// @RequiresPermissions("system:file:add")
+ @ResponseBody
+ public AjaxResult addtaskProcessFile(TaskfileInfo taskfileInfo,String dataId){
+ if(StringUtils.isNotEmpty(dataId)) {
+ taskfileInfo.setFiletype(1);
+ int b=taskfileInfoService.insertSelective(taskfileInfo, dataId);
+ if(b>0){
+ return success();
+ }else{
+ return error("请上传文件");
+ }
+ }
+ return error("请上传文件");
+ }
+ /**
+ * 展示文件跳转页面
+ */
+ @ApiOperation(value = "展示文件跳转页面", notes = "展示文件跳转页面")
+ @GetMapping("/viewfile/{id}")
+ public String viewfile(@PathVariable("id") String id,ModelMap mmap){
+ final List sysdatas = taskfileInfoService.queryTsysDataByTaskfileID(id);
+ mmap.put("tsysDatas",sysdatas);
+ return prefix + "/viewfile";
+ }
+
+ /**
+ * 展示文件跳转页面
+ */
+ @ApiOperation(value = "展示文件跳转页面", notes = "展示文件跳转页面")
+ @GetMapping("/viewAllfile/{taskid}")
+ public String viewAllfile(@PathVariable("taskid") String id,ModelMap mmap){
+ final List sysdatas = taskfileInfoService.getTaskFileByTaskidAndFiletype(id,0);
+ mmap.put("tsysDatas",sysdatas);
+ return prefix + "/viewfile";
+ }
+
+ /**
+ * 展示文件跳转页面
+ */
+ @ApiOperation(value = "展示文件跳转页面", notes = "展示文件跳转页面")
+ @GetMapping("/viewAllProcessfile/{taskid}")
+ public String viewAllProcessfile(@PathVariable("taskid") String id,ModelMap mmap){
+ final List sysdatas = taskfileInfoService.getTaskFileByTaskidAndFiletype(id,1);
+ mmap.put("tsysDatas",sysdatas);
+ return prefix + "/viewfile";
+ }
+}
diff --git a/src/main/java/com/zsess/taskmanage/controller/TaskinfoController.java b/src/main/java/com/zsess/taskmanage/controller/TaskinfoController.java
new file mode 100644
index 0000000000000000000000000000000000000000..2c36d79b3c585f0b2ec8957c07e0c79f329bce2f
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/controller/TaskinfoController.java
@@ -0,0 +1,499 @@
+package com.zsess.taskmanage.controller;
+
+import com.fc.test.common.base.BaseController;
+import com.fc.test.common.domain.AjaxResult;
+import com.fc.test.common.support.ConvertUtil;
+import com.fc.test.mapper.custom.RoleDao;
+import com.fc.test.model.auto.SysDepartment;
+import com.fc.test.model.auto.TsysRole;
+import com.fc.test.model.auto.TsysUser;
+import com.fc.test.model.custom.TableSplitResult;
+import com.fc.test.model.custom.Tablepar;
+import com.fc.test.model.custom.TitleVo;
+import com.fc.test.shiro.util.ShiroUtils;
+import com.github.pagehelper.util.StringUtil;
+import com.zsess.taskmanage.model.TaskStatus;
+import com.zsess.taskmanage.model.common.CommonIdNameBo;
+import com.zsess.taskmanage.service.TaskManageComService;
+import com.zsess.taskmanage.service.TaskfileInfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import com.github.pagehelper.PageInfo;
+import com.zsess.taskmanage.model.Taskinfo;
+import com.zsess.taskmanage.service.TaskinfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Api(value = "任务信息主表")
+@Controller
+@RequestMapping("/TaskinfoController")
+public class TaskinfoController extends BaseController {
+
+ private static Logger logger = LoggerFactory.getLogger(TaskinfoController.class);
+
+ private String prefix = "taskmanage/taskinfo";
+ @Resource
+ private RoleDao roleDao ;
+ @Resource
+ private TaskinfoService taskinfoService;
+ @Resource(name = "taskManageComService")
+ private TaskManageComService comService;
+ @Resource
+ private TaskfileInfoService taskfileInfoService;
+ /**
+ * 将前台传递过来的日期格式的字符串,自动转化为Date类型,因为通用类的日期格式包含时分秒,这里需要重写
+ */
+// @InitBinder
+// public void initBinder(WebDataBinder binder) throws Exception {
+// // 注册自定义的属性编辑器
+// DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+// df.setLenient(false);
+// CustomDateEditor dateEditor = new CustomDateEditor(df, true);
+// // 表示如果命令对象有Date类型的属性,将使用该属性编辑器进行类型转换
+// binder.registerCustomEditor(Date.class, dateEditor);
+// }
+
+ /**
+ * 任务发起人分页跳转
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/taskListForAddView")
+ @RequiresPermissions("gen:taskinfo:taskListForAddView")
+ public String taskListForAddView(ModelMap modelMap)
+ {
+ String str="执法任务发起";
+ this.setTaskListViewCommonInfo(modelMap, str);
+ return prefix + "/list";
+ }
+
+ /**
+ * 分页查询
+ */
+ //@Log(title = "任务信息主表集合查询", action = "list")
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/list")
+// @RequiresPermissions("gen:taskinfo:list")
+ @ResponseBody
+ public Object list(Tablepar tablepar, Taskinfo record){
+ final PageInfo page=taskinfoService.listForAddTask(tablepar,record) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ /**
+ * 浏览查询分页查询
+ */
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/listForView")
+// @RequiresPermissions("gen:taskinfo:list")
+ @ResponseBody
+ public Object listForView(Tablepar tablepar, Taskinfo record){
+ final PageInfo page=taskinfoService.listForView(tablepar,record) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ /**
+ * 任务审批列表分页查询
+ */
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/listForLeader")
+// @RequiresPermissions("gen:taskinfo:list")
+ @ResponseBody
+ public Object listForAuditLeader(Tablepar tablepar, Taskinfo record){
+ final PageInfo page=taskinfoService.listForAudiLeader(tablepar,record) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+
+ /**
+ * 任务审批管理跳转
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/tasklistLearderView")
+// @RequiresPermissions("gen:taskinfo:tasklistLearderView")
+ public String tasklistLearderView(ModelMap modelMap)
+ {
+ String str="执法任务审批";
+ this.setTaskListViewCommonInfo(modelMap, str);
+ final Taskinfo taskinfo = new Taskinfo();
+ modelMap.put("Taskinfo", taskinfo);
+ return prefix + "/tasklistForLeader";
+ }
+
+ /**
+ * 个人代办任务列表跳转
+ */
+ @ApiOperation(value = "个人代办任务列表跳转", notes = "个人代办任务列表跳转")
+ @GetMapping("/tasklistforPerson")
+// @RequiresPermissions("gen:taskinfo:tasklistLearderView")
+ public String tasklistforPerson(ModelMap modelMap)
+ {
+ String pageUrl = "";
+ final TsysUser user = ShiroUtils.getUser();
+ final String uid= user.getId();
+ boolean isLeader = false;
+ final List tsysRoles= roleDao.queryUserRole(uid);
+ final StringBuffer roleNamestr = new StringBuffer();
+ for(TsysRole role : tsysRoles) {
+ final String rolename = role.getName();
+ roleNamestr.append(",").append(rolename);
+ }
+ final Taskinfo taskinfo = new Taskinfo();
+ if(roleNamestr.indexOf(",任务管理员")>=0) {
+ pageUrl = this.taskListForAddView(modelMap);
+ modelMap.put("Taskinfo", taskinfo);
+ } else if (roleNamestr.indexOf(",科室负责人") > 0) {
+ pageUrl = this.taskProcessForLearderView(modelMap);
+ modelMap.put("Taskinfo", taskinfo);
+ } else if (roleNamestr.indexOf(",执法科普通人员") > 0) {
+ pageUrl = this.taskProcessListForExecutorView(modelMap);
+ modelMap.put("Taskinfo", taskinfo);
+ } else {
+ pageUrl = this.tasklistForView(modelMap, user.getDeptid().toString(),"2,4,5,8","");
+ }
+
+ return pageUrl;
+ }
+
+ /**
+ * 执法科待处理任务列表
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/tasklistForView/{deptid}/{statusstr}/{deptname}")
+// @RequiresPermissions("gen:taskinfo:tasklistLearderView")
+ public String tasklistForView(ModelMap modelMap,
+ @PathVariable("deptid")String deptid, @PathVariable("statusstr")String statusstr,
+ @PathVariable("deptname")String deptname)
+ {
+ String str= deptname + "代办任务列表查看";
+ this.setTaskListViewCommonInfo(modelMap, str);
+ final Taskinfo taskinfoCon = new Taskinfo();
+ if (StringUtil.isNotEmpty(deptid)) {
+ taskinfoCon.setReciveDeptid(Integer.valueOf(deptid));
+ }
+ taskinfoCon.setStatusstr(statusstr);
+ modelMap.put("Taskinfo", taskinfoCon);
+ return prefix + "/listForView";
+ }
+ /**
+ * 执法监督科待处理任务列表
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/taskAddlistForView/{deptid}/{statusstr}/{deptname}")
+// @RequiresPermissions("gen:taskinfo:tasklistLearderView")
+ public String taskAddlistForView(ModelMap modelMap,
+ @PathVariable("deptid")String deptid, @PathVariable("statusstr")String statusstr,
+ @PathVariable("deptname")String deptname)
+ {
+ String str= deptname + "代办任务列表查看";
+ this.setTaskListViewCommonInfo(modelMap, str);
+ final Taskinfo taskinfoCon = new Taskinfo();
+ if (StringUtil.isNotEmpty(deptid)) {
+ taskinfoCon.setDeptid(Integer.valueOf(deptid));
+ }
+ taskinfoCon.setStatusstr(statusstr);
+ modelMap.put("Taskinfo", taskinfoCon);
+ return prefix + "/listForView";
+ }
+
+ /**
+ * 部门负责人角色任务处理信息跳转
+ */
+ @ApiOperation(value = "任务处理信息分页跳转", notes = "任务处理信息分页跳转")
+ @GetMapping("/taskProcessForLearderView")
+// @RequiresPermissions("gen:taskinfo:taskProcessForLearderView")
+ public String taskProcessForLearderView(ModelMap modelMap)
+ {
+ String str="任务信息处理";
+ this.setTaskListViewCommonInfo(modelMap, str);
+ return prefix + "/taskProcessListForLeader";
+ }
+
+ /**
+ * 执行人员角色任务处理信息跳转
+ */
+ @ApiOperation(value = "执行人员角色任务处理信息分页跳转", notes = "执行人员角色任务处理信息分页跳转")
+ @GetMapping("/taskProcessListForExecutorView")
+// @RequiresPermissions("gen:taskinfo:taskProcessListForExecutorView")
+ public String taskProcessListForExecutorView(ModelMap modelMap)
+ {
+ String str="任务信息处理";
+ this.setTaskListViewCommonInfo(modelMap, str);
+ return prefix + "/taskProcessListForExecutor";
+ }
+
+ /**
+ * 设置通用任务列表信息数据
+ * @param modelMap
+ * @param title
+ */
+ private void setTaskListViewCommonInfo(ModelMap modelMap, String title) {
+ setTitle(modelMap, new TitleVo("列表", title + "管理", true, "欢迎进入" + title + "页面", true, false));
+ final List taskStatusList = this.comService.getTaskStatusList();
+ modelMap.addAttribute("taskStatusList", taskStatusList);
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList", deptList);
+ final List taskFreqList = this.comService.getTaskFreqList();
+ Taskinfo taskinfo = new Taskinfo();
+ modelMap.put("Taskinfo", taskinfo);
+ modelMap.addAttribute("taskFreqList", taskFreqList);
+ }
+
+ @ApiOperation(value = "任务处理分页查询", notes = "分页查询")
+ @PostMapping("/taskProcesslist")
+ @ResponseBody
+ public Object taskProcesslist(Tablepar tablepar, Taskinfo record){
+ final PageInfo page=taskinfoService.taskProcesslist(tablepar,record) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ @ApiOperation(value = "任务处理分页查询", notes = "分页查询")
+ @PostMapping("/tasklistProcessForExecutor")
+// @RequiresPermissions("gen:taskinfo:list")
+ @ResponseBody
+ public Object taskProcesslistForExecutor(Tablepar tablepar, Taskinfo record){
+ final PageInfo page=taskinfoService.taskProcesslistForExecutor(tablepar,record) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ /**
+ * 新增跳转
+ */
+ @ApiOperation(value = "新增跳转", notes = "新增跳转")
+ @GetMapping("/add")
+ public String add(ModelMap modelMap)
+ {
+ final List taskStatusList = this.comService.getTaskStatusList();
+ modelMap.addAttribute("taskStatusList",taskStatusList);
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList", deptList);
+ final List taskFreqList = this.comService.getTaskFreqList();
+ modelMap.addAttribute("taskFreqList",taskFreqList);
+ return prefix + "/addnewTask";
+ }
+ /**
+ * 新增跳转
+ */
+ @ApiOperation(value = "新增跳转", notes = "新增跳转")
+ @GetMapping("/addnewTaskForLeader")
+ public String addnewTaskForLeader(ModelMap modelMap)
+ {
+ final List taskStatusList = this.comService.getTaskStatusList();
+ modelMap.addAttribute("taskStatusList",taskStatusList);
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList", deptList);
+ final List taskFreqList = this.comService.getTaskFreqList();
+ modelMap.addAttribute("taskFreqList",taskFreqList);
+ return prefix + "/addnewTaskForLeader";
+ }
+ /**
+ * 新增
+ */
+ //@Log(title = "任务信息主表新增", action = "111")
+ @ApiOperation(value = "新增", notes = "新增")
+ @PostMapping("/add")
+ @RequiresPermissions("gen:taskinfo:add")
+ @ResponseBody
+ public AjaxResult add(Taskinfo taskinfo){
+ int b=taskinfoService.insertSelective(taskinfo);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 删除
+ * @param ids
+ * @return
+ */
+ //@Log(title = "任务信息主表删除", action = "111")
+ @ApiOperation(value = "删除", notes = "删除")
+ @PostMapping("/remove")
+ @RequiresPermissions("gen:taskinfo:remove")
+ @ResponseBody
+ public AjaxResult remove(String ids){
+ int b=taskinfoService.deleteByPrimaryKey(ids);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 检查Name
+ * @param taskinfo
+ * @return
+ */
+ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
+ @PostMapping("/checkNameUnique")
+ @ResponseBody
+ public int checkNameUnique(Taskinfo taskinfo){
+ int b=taskinfoService.checkNameUnique(taskinfo);
+ if(b>0){
+ return 1;
+ }else{
+ return 0;
+ }
+ }
+
+
+ /**
+ * 修改跳转
+ * @param id
+ * @param modelMap
+ * @return .
+ */
+ @ApiOperation(value = "修改跳转", notes = "修改跳转")
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") String id, ModelMap modelMap)
+ {
+ final List taskStatusList = this.comService.getTaskStatusList();
+ modelMap.addAttribute("taskStatusList",taskStatusList);
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList", deptList);
+ modelMap.put("Taskinfo", taskinfoService.selectByPrimaryKey(id));
+ final List taskFreqList = this.comService.getTaskFreqList();
+ modelMap.addAttribute("taskFreqList",taskFreqList);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存
+ */
+ //@Log(title = "任务信息主表修改", action = "111")
+ @ApiOperation(value = "修改保存", notes = "修改保存")
+ @RequiresPermissions("gen:taskinfo:edit")
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(Taskinfo record)
+ {
+ return toAjax(taskinfoService.updateByPrimaryKeySelective(record));
+ }
+
+
+ /**
+ * 根据主键查询
+ *
+ * @param id
+ * @return .
+ */
+ @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
+ @PostMapping("/get/{id}")
+ public Taskinfo edit(@PathVariable("id") String id) {
+ return taskinfoService.selectByPrimaryKey(id);
+ }
+
+ /**
+ * 批量审核
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "删除", notes = "删除")
+ @PostMapping("/batchAuditTaskstatus")
+// @RequiresPermissions("gen:taskinfo:remove")
+ @ResponseBody
+ public AjaxResult batchAuditTaskstatus(String ids, Integer zt){
+ logger.info("进入批量任务下达审批方法:batchAuditTaskstatus(" + ids + ")");
+ final List idList= ConvertUtil.toListStrArray(ids);
+ int result =taskinfoService.updateStatusByids(zt, idList);
+ if(result>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+ /**
+ * 新增任务
+ */
+ @ApiOperation(value = "新增任务", notes = "新增任务")
+ @PostMapping("/addNewTask")
+ @ResponseBody
+ public AjaxResult addNewTask(Taskinfo taskinfo){
+ taskinfo.setStatusid(TaskStatus.ADD.getIndex());
+ int b=taskinfoService.insertSelective(taskinfo);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+ /**
+ * 新增任务
+ */
+ @ApiOperation(value = "新增任务", notes = "新增任务")
+ @PostMapping("/addNewTaskForLeader")
+ @ResponseBody
+ public AjaxResult addNewTaskForLeader(Taskinfo taskinfo){
+ taskinfo.setStatusid(TaskStatus.ASSIGN.getIndex());
+ int b=taskinfoService.insertSelective(taskinfo);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 修改跳转
+ * @param id
+ * @param modelMap
+ * @return .
+ */
+ @ApiOperation(value = "任務分配到執行人跳转", notes = "任務分配到執行人跳转")
+ @GetMapping("/assginToExecutorPage/{id}")
+ public String assginToExecutorPage(@PathVariable("id") String id, ModelMap modelMap)
+ {
+
+ final List taskStatusList = this.comService.getTaskStatusList();
+ modelMap.addAttribute("taskStatusList",taskStatusList);
+
+ final List taskFreqList = this.comService.getTaskFreqList();
+ modelMap.addAttribute("taskFreqList",taskFreqList);
+
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList", deptList);
+
+ final Taskinfo taskInfo = taskinfoService.selectByPrimaryKey(id);
+ modelMap.put("Taskinfo", taskInfo);
+
+// final List sysdatas = taskfileInfoService.queryTsysDataByTaskid(id);
+// modelMap.put("tsysDatas",sysdatas);
+
+ final Integer deptid = taskInfo.getReciveDeptid();
+ final List userList = this.sysUserService.getUserlistByDeptid(deptid);
+ modelMap.put("userList", userList);
+ return prefix + "/assignToExecutor";
+ }
+
+ /**
+ * 修改保存
+ */
+ @ApiOperation(value = "任務分配到執行人保存", notes = "任務分配到執行人保存")
+ @PostMapping("/assignExecutorSeve")
+ @ResponseBody
+ public AjaxResult assignExecutorSeve(Taskinfo record)
+ {
+ logger.info("任务分配执行人");
+ record.setStatusid(TaskStatus.ACCEPTED.getIndex());
+ record.setUpdatetime(new Date());
+ final int rs = taskinfoService.updateByPrimaryKeySelective(record);
+ return toAjax(rs);
+ }
+
+
+}
diff --git a/src/main/java/com/zsess/taskmanage/controller/TaskprocessInfoController.java b/src/main/java/com/zsess/taskmanage/controller/TaskprocessInfoController.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e9b343a5db20f413b47187e66c3b204cef35f7b
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/controller/TaskprocessInfoController.java
@@ -0,0 +1,288 @@
+package com.zsess.taskmanage.controller;
+
+import com.fc.test.common.base.BaseController;
+import com.fc.test.common.domain.AjaxResult;
+import com.fc.test.model.auto.SysDepartment;
+import com.fc.test.model.auto.TsysUser;
+import com.fc.test.model.custom.TableSplitResult;
+import com.fc.test.model.custom.Tablepar;
+import com.fc.test.model.custom.TitleVo;
+import com.fc.test.shiro.util.ShiroUtils;
+import com.zsess.taskmanage.model.TaskStatus;
+import com.zsess.taskmanage.model.Taskinfo;
+import com.zsess.taskmanage.model.common.CommonIdNameBo;
+import com.zsess.taskmanage.service.TaskManageComService;
+import com.zsess.taskmanage.service.TaskinfoService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.StopWatch;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.github.pagehelper.PageInfo;
+import com.zsess.taskmanage.model.TaskprocessInfo;
+import com.zsess.taskmanage.service.TaskprocessInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Api(value = "任务管理执行过程信息")
+@Controller
+@RequestMapping("/TaskprocessInfoController")
+public class TaskprocessInfoController extends BaseController {
+ private static Logger logger = LoggerFactory.getLogger(TaskprocessInfoController.class);
+ private String prefix = "taskmanage/taskprocessInfo";
+ @Autowired
+ private TaskprocessInfoService taskprocessInfoService;
+ @Resource
+ private TaskinfoService taskinfoService;
+ @Resource(name = "taskManageComService")
+ private TaskManageComService comService;
+
+ /**
+ * 分页跳转
+ */
+ @ApiOperation(value = "分页跳转", notes = "分页跳转")
+ @GetMapping("/taskProcessInfoOper/{taskid}")
+// @RequiresPermissions("gen:taskprocessInfo:view")
+ public String view(ModelMap modelMap,@PathVariable("taskid") String taskid)
+ {
+// String str="任务执行处理信息";
+// setTitle(modelMap, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false));
+ final List taskStatusList = this.comService.getTaskStatusList();
+ modelMap.addAttribute("taskStatusList",taskStatusList);
+ final List deptList = sysDepartmentService.getDeptsWithoutRoot();
+ modelMap.put("deptList", deptList);
+ final List taskFreqList = this.comService.getTaskFreqList();
+ modelMap.addAttribute("taskFreqList", taskFreqList);
+
+ modelMap.put("Taskinfo", taskinfoService.selectByPrimaryKey(taskid));
+
+
+ return prefix + "/taskProcessInfo";
+ }
+
+ @GetMapping("/taskProcessInfoView/{taskid}")
+// @RequiresPermissions("gen:taskprocessInfo:view")
+ public String taskProcessInfoView(ModelMap modelMap,@PathVariable("taskid") String taskid)
+ {
+ modelMap.put("Taskinfo", taskinfoService.selectByPrimaryKey(taskid));
+ return prefix + "/taskProcessInfoView";
+ }
+
+ /**
+ * 分页查询
+ */
+ //@Log(title = "任务管理执行过程信息集合查询", action = "111")
+ @ApiOperation(value = "分页查询", notes = "分页查询")
+ @PostMapping("/taskProcessInfoList")
+// @RequiresPermissions("gen:taskprocessInfo:list")
+ @ResponseBody
+ public Object taskProcessInfoList(Tablepar tablepar, Taskinfo record,String selfSearch){
+ final TaskprocessInfo processInfo = new TaskprocessInfo();
+ processInfo.setTaskid(selfSearch);
+ final PageInfo page=taskprocessInfoService.getTaskProcesslistBytaskid(tablepar,processInfo) ;
+ final TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList());
+ return result;
+ }
+
+ /**
+ * 新增跳转
+ */
+ @ApiOperation(value = "新增跳转", notes = "新增跳转")
+ @GetMapping("/add/{taskid}")
+ public String add(ModelMap modelMap, @PathVariable("taskid") String taskid)
+ {
+ modelMap.put("taskid", taskid);
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增
+ */
+ @ApiOperation(value = "新增", notes = "新增")
+ @PostMapping("/add")
+// @RequiresPermissions("gen:taskprocessInfo:add")
+ @ResponseBody
+ public AjaxResult add(TaskprocessInfo taskprocessInfo){
+ final String taskid = taskprocessInfo.getTaskid();
+ final Taskinfo taskifno = taskinfoService.selectByPrimaryKey(taskid);
+ final Integer taskstatus4 = TaskStatus.EXECUTING.getIndex();
+ if (!taskstatus4.equals(taskifno.getStatusid()) ) {
+ taskifno.setStatusid(taskstatus4);
+ final int rs = taskinfoService.updateByPrimaryKeySelective(taskifno);
+ }
+ final AjaxResult rs = genComProcessInfo(taskprocessInfo, taskstatus4,0);
+ return rs;
+ }
+
+ /**
+ * 任务分配退回跳转
+ */
+ @ApiOperation(value = "任务分配退回跳转", notes = "任务分配退回跳转")
+ @GetMapping("/assignBack/{taskid}/{statusid}")
+ public String assignBack(ModelMap modelMap, @PathVariable("taskid") String taskid,
+ @PathVariable("statusid") Integer statusid)
+ {
+ modelMap.put("taskid", taskid);
+ final Taskinfo taskinfo = taskinfoService.selectByPrimaryKey(taskid);
+// final Integer statusid = taskinfo.getStatusid();
+ modelMap.put("statusid", statusid);
+ modelMap.put("taskname", taskinfo.getTaskname());
+ String urlpath = "/assignBack";
+ if (statusid.equals(Integer.valueOf(8))) {
+ urlpath = "/completeBack";
+ }
+ return prefix + urlpath;
+ }
+ /**
+ * 任务分配回退保存
+ */
+ @ApiOperation(value = "任务分配回退保存", notes = "任务分配回退保存")
+ @PostMapping("/assignBack")
+ @ResponseBody
+ public AjaxResult assignBack(TaskprocessInfo taskprocessInfo){
+ logger.info("任务分配审核:退回");
+ final String taskid = taskprocessInfo.getTaskid();
+ final Taskinfo taskifno = taskinfoService.selectByPrimaryKey(taskid);
+ final Integer taskstatus3 = TaskStatus.ASSIGNBACK.getIndex();
+ if (!taskstatus3.equals(taskifno.getStatusid()) ) {
+ taskifno.setStatusid(taskstatus3);
+ final int rs = taskinfoService.updateByPrimaryKeySelective(taskifno);
+ }
+ final AjaxResult rs = genComProcessInfo(taskprocessInfo, taskstatus3,1);
+ return rs;
+ }
+
+ /**
+ * 任务分配回退保存
+ */
+ @ApiOperation(value = "任务分配回退保存", notes = "任务分配回退保存")
+ @PostMapping("/completeBack")
+ @ResponseBody
+ public AjaxResult completeBack(TaskprocessInfo taskprocessInfo){
+ logger.info("任务完成申请审核:退回");
+ final String taskid = taskprocessInfo.getTaskid();
+ final Taskinfo taskifno = taskinfoService.selectByPrimaryKey(taskid);
+ final Integer taskstatus8 = TaskStatus.COMPLETEBACK.getIndex();
+ if (!taskstatus8.equals(taskifno.getStatusid()) ) {
+ taskifno.setStatusid(taskstatus8);
+ final int rs = taskinfoService.updateByPrimaryKeySelective(taskifno);
+ }
+ final AjaxResult rs = genComProcessInfo(taskprocessInfo, taskstatus8, 1);
+ return rs;
+ }
+
+ /**
+ * 生成公共的任务处理信息.
+ * @param taskprocessInfo
+ * @param taskstatusid
+ * @param processStatueid
+ * @return
+ */
+ private AjaxResult genComProcessInfo(TaskprocessInfo taskprocessInfo, Integer taskstatusid, Integer processStatueid) {
+ final TsysUser user = ShiroUtils.getUser();
+ taskprocessInfo.setCreatetime(new Date());
+ taskprocessInfo.setDetpid(user.getDeptid());
+ taskprocessInfo.setUserid(user.getId());
+ taskprocessInfo.setUpdatetime(new Date());
+ taskprocessInfo.setStatusid(taskstatusid);
+ taskprocessInfo.setProcessstatus(processStatueid);
+ int b = taskprocessInfoService.insertSelective(taskprocessInfo);
+ if (b > 0) {
+ return success();
+ } else {
+ return error();
+ }
+ }
+
+ /**
+ * 删除
+ * @param ids
+ * @return
+ */
+ //@Log(title = "任务管理执行过程信息删除", action = "111")
+ @ApiOperation(value = "删除", notes = "删除")
+ @PostMapping("/remove")
+ @RequiresPermissions("gen:taskprocessInfo:remove")
+ @ResponseBody
+ public AjaxResult remove(String ids){
+ int b=taskprocessInfoService.deleteByPrimaryKey(ids);
+ if(b>0){
+ return success();
+ }else{
+ return error();
+ }
+ }
+
+ /**
+ * 检查Name
+ * @param taskprocessInfo
+ * @return
+ */
+ @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一")
+ @PostMapping("/checkNameUnique")
+ @ResponseBody
+ public int checkNameUnique(TaskprocessInfo taskprocessInfo){
+ int b=taskprocessInfoService.checkNameUnique(taskprocessInfo);
+ if(b>0){
+ return 1;
+ }else{
+ return 0;
+ }
+ }
+
+
+ /**
+ * 修改跳转
+ * @param id
+ * @param mmap
+ * @return
+ */
+ @ApiOperation(value = "修改跳转", notes = "修改跳转")
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") String id, ModelMap mmap)
+ {
+ mmap.put("TaskprocessInfo", taskprocessInfoService.selectByPrimaryKey(id));
+
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存
+ */
+ //@Log(title = "任务管理执行过程信息修改", action = "111")
+ @ApiOperation(value = "修改保存", notes = "修改保存")
+ @RequiresPermissions("gen:taskprocessInfo:edit")
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(TaskprocessInfo record)
+ {
+ return toAjax(taskprocessInfoService.updateByPrimaryKeySelective(record));
+ }
+
+
+ /**
+ * 根据主键查询
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一")
+ @PostMapping("/get/{id}")
+ public TaskprocessInfo edit(@PathVariable("id") String id) {
+ return taskprocessInfoService.selectByPrimaryKey(id);
+ }
+
+
+
+}
diff --git a/src/main/java/com/zsess/taskmanage/mapper/DeptTaskInfoDao.java b/src/main/java/com/zsess/taskmanage/mapper/DeptTaskInfoDao.java
new file mode 100644
index 0000000000000000000000000000000000000000..b22e539a01b0ea9b484256a03099fe09b51443fe
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/mapper/DeptTaskInfoDao.java
@@ -0,0 +1,28 @@
+package com.zsess.taskmanage.mapper;
+
+import com.zsess.taskmanage.model.DeptTaskInfo;
+
+import java.util.List;
+
+/**
+ * 部门任务信息mapper
+ */
+public interface DeptTaskInfoDao {
+ /**
+ * 获取任务发起部门的待处理信息.
+ * @return
+ */
+ List getDeptAddtaskInfo();
+
+ /**
+ * 获取执行中的部门任务信息.
+ * @return
+ */
+ List getDeptExetaskInfo();
+
+ /**
+ * 获取各部门已完成任务数量.
+ * @return
+ */
+ ListgetDeptTaskCompleteNum();
+}
diff --git a/src/main/java/com/zsess/taskmanage/mapper/TaskfileInfoMapper.java b/src/main/java/com/zsess/taskmanage/mapper/TaskfileInfoMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..642cee09980b0d09c26881418ba392f3f4606185
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/mapper/TaskfileInfoMapper.java
@@ -0,0 +1,38 @@
+package com.zsess.taskmanage.mapper;
+
+import com.zsess.taskmanage.model.TaskfileInfo;
+import com.zsess.taskmanage.model.TaskfileInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 任务管理附件信息表 TaskfileInfoMapper
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-16 15:39:49
+ */
+public interface TaskfileInfoMapper {
+
+ long countByExample(TaskfileInfoExample example);
+
+ int deleteByExample(TaskfileInfoExample example);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(TaskfileInfo record);
+
+ int insertSelective(TaskfileInfo record);
+
+ List selectByExample(TaskfileInfoExample example);
+
+ TaskfileInfo selectByPrimaryKey(String id);
+
+ int updateByExampleSelective(@Param("record") TaskfileInfo record, @Param("example") TaskfileInfoExample example);
+
+ int updateByExample(@Param("record") TaskfileInfo record, @Param("example") TaskfileInfoExample example);
+
+ int updateByPrimaryKeySelective(TaskfileInfo record);
+
+ int updateByPrimaryKey(TaskfileInfo record);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/mapper/TaskinfoMapper.java b/src/main/java/com/zsess/taskmanage/mapper/TaskinfoMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b1ca2becf9d6c6104b1297752c01aff0a9c00cd
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/mapper/TaskinfoMapper.java
@@ -0,0 +1,48 @@
+package com.zsess.taskmanage.mapper;
+// com.zsess.taskmanage.mapper.auto.TaskinfoMapper
+
+import com.zsess.taskmanage.model.Taskinfo;
+import com.zsess.taskmanage.model.TaskinfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 任务信息主表 TaskinfoMapper
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-06 15:25:56
+ */
+public interface TaskinfoMapper {
+
+ long countByExample(TaskinfoExample example);
+
+ int deleteByExample(TaskinfoExample example);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(Taskinfo record);
+
+ int insertSelective(Taskinfo record);
+
+ List selectByExample(TaskinfoExample example);
+
+ Taskinfo selectByPrimaryKey(String id);
+
+ int updateByExampleSelective(@Param("record") Taskinfo record, @Param("example") TaskinfoExample example);
+
+ int updateByExample(@Param("record") Taskinfo record, @Param("example") TaskinfoExample example);
+
+ int updateByPrimaryKeySelective(Taskinfo record);
+
+ int updateByPrimaryKey(Taskinfo record);
+
+ /**
+ * 根据任务ids更新任务状态
+ * @param statusid 任务状态id
+ * @param ids 任务id
+ * @return 更新结果
+ */
+ int updateStatusByids(@Param("statusid") Integer statusid,@Param("ids") Listids);
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/mapper/TaskprocessInfoMapper.java b/src/main/java/com/zsess/taskmanage/mapper/TaskprocessInfoMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..12c0e75b74d3619ed0ca8ad13d7909594ccb2e16
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/mapper/TaskprocessInfoMapper.java
@@ -0,0 +1,38 @@
+package com.zsess.taskmanage.mapper;
+
+import com.zsess.taskmanage.model.TaskprocessInfo;
+import com.zsess.taskmanage.model.TaskprocessInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 任务管理执行过程信息 TaskprocessInfoMapper
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-15 10:42:35
+ */
+public interface TaskprocessInfoMapper {
+
+ long countByExample(TaskprocessInfoExample example);
+
+ int deleteByExample(TaskprocessInfoExample example);
+
+ int deleteByPrimaryKey(String id);
+
+ int insert(TaskprocessInfo record);
+
+ int insertSelective(TaskprocessInfo record);
+
+ List selectByExample(TaskprocessInfoExample example);
+
+ TaskprocessInfo selectByPrimaryKey(String id);
+
+ int updateByExampleSelective(@Param("record") TaskprocessInfo record, @Param("example") TaskprocessInfoExample example);
+
+ int updateByExample(@Param("record") TaskprocessInfo record, @Param("example") TaskprocessInfoExample example);
+
+ int updateByPrimaryKeySelective(TaskprocessInfo record);
+
+ int updateByPrimaryKey(TaskprocessInfo record);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/DeptTaskInfo.java b/src/main/java/com/zsess/taskmanage/model/DeptTaskInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..6555fbeeb4c9e3b79e857e9919a5fce5fceed451
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/DeptTaskInfo.java
@@ -0,0 +1,53 @@
+package com.zsess.taskmanage.model;
+
+import java.io.Serializable;
+
+/**
+ * 部门任务信息.
+ */
+public class DeptTaskInfo implements Serializable {
+
+ private Integer deptid;
+
+ private String deptname;
+ /**
+ * 执行中的任务数量
+ */
+ private Integer tasknum;
+ /**
+ * 任务状态集
+ */
+ private String statusstr;
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getDeptname() {
+ return deptname;
+ }
+
+ public void setDeptname(String deptname) {
+ this.deptname = deptname;
+ }
+
+ public Integer getTasknum() {
+ return tasknum;
+ }
+
+ public void setTasknum(Integer tasknum) {
+ this.tasknum = tasknum;
+ }
+
+ public String getStatusstr() {
+ return statusstr;
+ }
+
+ public void setStatusstr(String statusstr) {
+ this.statusstr = statusstr;
+ }
+}
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskStatus.java b/src/main/java/com/zsess/taskmanage/model/TaskStatus.java
new file mode 100644
index 0000000000000000000000000000000000000000..eda3b8651dc6f4957c48cac7c05a90d2ac97799e
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskStatus.java
@@ -0,0 +1,42 @@
+package com.zsess.taskmanage.model;
+
+public enum TaskStatus {
+
+ ADD("新增",0), ASSIGN("已分配",1),
+ ASSIGNCONFIRM("分配确认",2),
+ ASSIGNBACK("分配退回",3),
+ ACCEPTED("任务接收",4),
+ EXECUTING("执行中",5),COMPLETEAPPLY("任务完成申请",6),
+ COMPLETED("任务完成",7),
+ COMPLETEBACK("完成申请退回",8);
+ private int index;
+ private String name;
+
+ private TaskStatus(String name ,int index) {
+ this.index = index;
+ this.name = name;
+ }
+
+ // 普通方法
+ public static String getName(int index) {
+ for (TaskStatus r : TaskStatus.values()) {
+ if (r.getIndex() == index) {
+ return r.name;
+ }
+ }
+ return null;
+ }
+ // get set 方法
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public int getIndex() {
+ return index;
+ }
+ public void setIndex(int index) {
+ this.index = index;
+ }
+}
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskfileInfo.java b/src/main/java/com/zsess/taskmanage/model/TaskfileInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..1af9f8a70a643664df8127d46afee7ad016b0d37
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskfileInfo.java
@@ -0,0 +1,187 @@
+package com.zsess.taskmanage.model;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.lang.Integer;
+
+/**
+ * 任务管理附件信息表 TaskfileInfo
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-16 15:39:49
+ */
+ @ApiModel(value="TaskfileInfo", description="任务管理附件信息表")
+public class TaskfileInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /** 附件id **/
+ @ApiModelProperty(value = "附件id")
+ private String id;
+
+ /** 任务id **/
+ @ApiModelProperty(value = "任务id")
+ private String taskid;
+
+ /** 附件类型, 0任务信息;1任务汇报 **/
+ @ApiModelProperty(value = "附件类型, 0任务信息;1任务汇报")
+ private Integer filetype;
+
+ /** 文件名称 **/
+ @ApiModelProperty(value = "文件名称")
+ private String filename;
+
+ /** 附件数据id
+ **/
+ @ApiModelProperty(value = "附件数据id ")
+ private String dataId;
+
+ /** 上传人员 **/
+ @ApiModelProperty(value = "上传人员")
+ private String createuserid;
+
+ /** 上传时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "上传时间")
+ private Date createtime;
+
+ /** 上传人员名称 **/
+ @ApiModelProperty(value = "上传人员名称")
+ private String createusername;
+
+ /** 上传部门id **/
+ @ApiModelProperty(value = "上传部门id")
+ private Integer createdeptid;
+
+
+ /** 上传部门名称 **/
+ @ApiModelProperty(value = "上传部门名称")
+ private String createdeptname;
+ /**
+ * 任务执行id.
+ */
+ private String processid;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+
+ public String getTaskid() {
+ return taskid;
+ }
+
+ public void setTaskid(String taskid) {
+ this.taskid = taskid;
+ }
+
+
+ public Integer getFiletype() {
+ return filetype;
+ }
+
+ public void setFiletype(Integer filetype) {
+ this.filetype = filetype;
+ }
+
+
+ public String getFilename() {
+ return filename;
+ }
+
+ public void setFilename(String filename) {
+ this.filename = filename;
+ }
+
+
+ public String getDataId() {
+ return dataId;
+ }
+
+ public void setDataId(String dataId) {
+ this.dataId = dataId;
+ }
+
+
+ public String getCreateuserid() {
+ return createuserid;
+ }
+
+ public void setCreateuserid(String createuserid) {
+ this.createuserid = createuserid;
+ }
+
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+
+ public String getCreateusername() {
+ return createusername;
+ }
+
+ public void setCreateusername(String createusername) {
+ this.createusername = createusername;
+ }
+
+
+ public Integer getCreatedeptid() {
+ return createdeptid;
+ }
+
+ public void setCreatedeptid(Integer createdeptid) {
+ this.createdeptid = createdeptid;
+ }
+
+
+ public String getCreatedeptname() {
+ return createdeptname;
+ }
+
+ public void setCreatedeptname(String createdeptname) {
+ this.createdeptname = createdeptname;
+ }
+
+
+ public TaskfileInfo() {
+ super();
+ }
+
+
+ public TaskfileInfo(String id,String taskid,Integer filetype,String filename,String dataId,String createuserid,Date createtime,String createusername,Integer createdeptid,String createdeptname) {
+
+ this.id = id;
+ this.taskid = taskid;
+ this.filetype = filetype;
+ this.filename = filename;
+ this.dataId = dataId;
+ this.createuserid = createuserid;
+ this.createtime = createtime;
+ this.createusername = createusername;
+ this.createdeptid = createdeptid;
+ this.createdeptname = createdeptname;
+
+ }
+
+ public String getProcessid() {
+ return processid;
+ }
+
+ public void setProcessid(String processid) {
+ this.processid = processid;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskfileInfoExample.java b/src/main/java/com/zsess/taskmanage/model/TaskfileInfoExample.java
new file mode 100644
index 0000000000000000000000000000000000000000..6e32e0f042249f944859c091697aa8b3781f7643
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskfileInfoExample.java
@@ -0,0 +1,1000 @@
+package com.zsess.taskmanage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import cn.hutool.core.util.StrUtil;
+/**
+ * 任务管理附件信息表 TaskfileInfoExample
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-16 15:39:49
+ */
+public class TaskfileInfoExample {
+
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List oredCriteria;
+
+ public TaskfileInfoExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andIdIsNull() {
+ addCriterion("id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIsNotNull() {
+ addCriterion("id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdEqualTo(String value) {
+ addCriterion("id =", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotEqualTo(String value) {
+ addCriterion("id <>", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThan(String value) {
+ addCriterion("id >", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdGreaterThanOrEqualTo(String value) {
+ addCriterion("id >=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThan(String value) {
+ addCriterion("id <", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLessThanOrEqualTo(String value) {
+ addCriterion("id <=", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdLike(String value) {
+ addCriterion("id like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotLike(String value) {
+ addCriterion("id not like", value, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdIn(List values) {
+ addCriterion("id in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotIn(List values) {
+ addCriterion("id not in", values, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdBetween(String value1, String value2) {
+ addCriterion("id between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+ public Criteria andIdNotBetween(String value1, String value2) {
+ addCriterion("id not between", value1, value2, "id");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andTaskidIsNull() {
+ addCriterion("taskid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidIsNotNull() {
+ addCriterion("taskid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidEqualTo(String value) {
+ addCriterion("taskid =", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotEqualTo(String value) {
+ addCriterion("taskid <>", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidGreaterThan(String value) {
+ addCriterion("taskid >", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidGreaterThanOrEqualTo(String value) {
+ addCriterion("taskid >=", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLessThan(String value) {
+ addCriterion("taskid <", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLessThanOrEqualTo(String value) {
+ addCriterion("taskid <=", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLike(String value) {
+ addCriterion("taskid like", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotLike(String value) {
+ addCriterion("taskid not like", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidIn(List values) {
+ addCriterion("taskid in", values, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotIn(List values) {
+ addCriterion("taskid not in", values, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidBetween(String value1, String value2) {
+ addCriterion("taskid between", value1, value2, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotBetween(String value1, String value2) {
+ addCriterion("taskid not between", value1, value2, "taskid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andFiletypeIsNull() {
+ addCriterion("filetype is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeIsNotNull() {
+ addCriterion("filetype is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeEqualTo(Integer value) {
+ addCriterion("filetype =", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeNotEqualTo(Integer value) {
+ addCriterion("filetype <>", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeGreaterThan(Integer value) {
+ addCriterion("filetype >", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeGreaterThanOrEqualTo(Integer value) {
+ addCriterion("filetype >=", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeLessThan(Integer value) {
+ addCriterion("filetype <", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeLessThanOrEqualTo(Integer value) {
+ addCriterion("filetype <=", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeLike(Integer value) {
+ addCriterion("filetype like", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeNotLike(Integer value) {
+ addCriterion("filetype not like", value, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeIn(List values) {
+ addCriterion("filetype in", values, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeNotIn(List values) {
+ addCriterion("filetype not in", values, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeBetween(Integer value1, Integer value2) {
+ addCriterion("filetype between", value1, value2, "filetype");
+ return (Criteria) this;
+ }
+
+ public Criteria andFiletypeNotBetween(Integer value1, Integer value2) {
+ addCriterion("filetype not between", value1, value2, "filetype");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andFilenameIsNull() {
+ addCriterion("filename is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameIsNotNull() {
+ addCriterion("filename is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameEqualTo(String value) {
+ addCriterion("filename =", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameNotEqualTo(String value) {
+ addCriterion("filename <>", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameGreaterThan(String value) {
+ addCriterion("filename >", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameGreaterThanOrEqualTo(String value) {
+ addCriterion("filename >=", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameLessThan(String value) {
+ addCriterion("filename <", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameLessThanOrEqualTo(String value) {
+ addCriterion("filename <=", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameLike(String value) {
+ addCriterion("filename like", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameNotLike(String value) {
+ addCriterion("filename not like", value, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameIn(List values) {
+ addCriterion("filename in", values, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameNotIn(List values) {
+ addCriterion("filename not in", values, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameBetween(String value1, String value2) {
+ addCriterion("filename between", value1, value2, "filename");
+ return (Criteria) this;
+ }
+
+ public Criteria andFilenameNotBetween(String value1, String value2) {
+ addCriterion("filename not between", value1, value2, "filename");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andDataIdIsNull() {
+ addCriterion("data_id is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdIsNotNull() {
+ addCriterion("data_id is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdEqualTo(String value) {
+ addCriterion("data_id =", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdNotEqualTo(String value) {
+ addCriterion("data_id <>", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdGreaterThan(String value) {
+ addCriterion("data_id >", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdGreaterThanOrEqualTo(String value) {
+ addCriterion("data_id >=", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdLessThan(String value) {
+ addCriterion("data_id <", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdLessThanOrEqualTo(String value) {
+ addCriterion("data_id <=", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdLike(String value) {
+ addCriterion("data_id like", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdNotLike(String value) {
+ addCriterion("data_id not like", value, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdIn(List values) {
+ addCriterion("data_id in", values, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdNotIn(List values) {
+ addCriterion("data_id not in", values, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdBetween(String value1, String value2) {
+ addCriterion("data_id between", value1, value2, "dataId");
+ return (Criteria) this;
+ }
+
+ public Criteria andDataIdNotBetween(String value1, String value2) {
+ addCriterion("data_id not between", value1, value2, "dataId");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreateuseridIsNull() {
+ addCriterion("createuserid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridIsNotNull() {
+ addCriterion("createuserid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridEqualTo(String value) {
+ addCriterion("createuserid =", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridNotEqualTo(String value) {
+ addCriterion("createuserid <>", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridGreaterThan(String value) {
+ addCriterion("createuserid >", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridGreaterThanOrEqualTo(String value) {
+ addCriterion("createuserid >=", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridLessThan(String value) {
+ addCriterion("createuserid <", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridLessThanOrEqualTo(String value) {
+ addCriterion("createuserid <=", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridLike(String value) {
+ addCriterion("createuserid like", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridNotLike(String value) {
+ addCriterion("createuserid not like", value, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridIn(List values) {
+ addCriterion("createuserid in", values, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridNotIn(List values) {
+ addCriterion("createuserid not in", values, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridBetween(String value1, String value2) {
+ addCriterion("createuserid between", value1, value2, "createuserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateuseridNotBetween(String value1, String value2) {
+ addCriterion("createuserid not between", value1, value2, "createuserid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreatetimeIsNull() {
+ addCriterion("createtime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIsNotNull() {
+ addCriterion("createtime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeEqualTo(Date value) {
+ addCriterion("createtime =", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotEqualTo(Date value) {
+ addCriterion("createtime <>", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThan(Date value) {
+ addCriterion("createtime >", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("createtime >=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThan(Date value) {
+ addCriterion("createtime <", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("createtime <=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLike(Date value) {
+ addCriterion("createtime like", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotLike(Date value) {
+ addCriterion("createtime not like", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIn(List values) {
+ addCriterion("createtime in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotIn(List values) {
+ addCriterion("createtime not in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeBetween(Date value1, Date value2) {
+ addCriterion("createtime between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("createtime not between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreateusernameIsNull() {
+ addCriterion("createusername is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameIsNotNull() {
+ addCriterion("createusername is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameEqualTo(String value) {
+ addCriterion("createusername =", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameNotEqualTo(String value) {
+ addCriterion("createusername <>", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameGreaterThan(String value) {
+ addCriterion("createusername >", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameGreaterThanOrEqualTo(String value) {
+ addCriterion("createusername >=", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameLessThan(String value) {
+ addCriterion("createusername <", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameLessThanOrEqualTo(String value) {
+ addCriterion("createusername <=", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameLike(String value) {
+ addCriterion("createusername like", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameNotLike(String value) {
+ addCriterion("createusername not like", value, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameIn(List values) {
+ addCriterion("createusername in", values, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameNotIn(List values) {
+ addCriterion("createusername not in", values, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameBetween(String value1, String value2) {
+ addCriterion("createusername between", value1, value2, "createusername");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreateusernameNotBetween(String value1, String value2) {
+ addCriterion("createusername not between", value1, value2, "createusername");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreatedeptidIsNull() {
+ addCriterion("createdeptid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidIsNotNull() {
+ addCriterion("createdeptid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidEqualTo(Integer value) {
+ addCriterion("createdeptid =", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidNotEqualTo(Integer value) {
+ addCriterion("createdeptid <>", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidGreaterThan(Integer value) {
+ addCriterion("createdeptid >", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("createdeptid >=", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidLessThan(Integer value) {
+ addCriterion("createdeptid <", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidLessThanOrEqualTo(Integer value) {
+ addCriterion("createdeptid <=", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidLike(Integer value) {
+ addCriterion("createdeptid like", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidNotLike(Integer value) {
+ addCriterion("createdeptid not like", value, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidIn(List values) {
+ addCriterion("createdeptid in", values, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidNotIn(List values) {
+ addCriterion("createdeptid not in", values, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidBetween(Integer value1, Integer value2) {
+ addCriterion("createdeptid between", value1, value2, "createdeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptidNotBetween(Integer value1, Integer value2) {
+ addCriterion("createdeptid not between", value1, value2, "createdeptid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreatedeptnameIsNull() {
+ addCriterion("createdeptname is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameIsNotNull() {
+ addCriterion("createdeptname is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameEqualTo(String value) {
+ addCriterion("createdeptname =", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameNotEqualTo(String value) {
+ addCriterion("createdeptname <>", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameGreaterThan(String value) {
+ addCriterion("createdeptname >", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameGreaterThanOrEqualTo(String value) {
+ addCriterion("createdeptname >=", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameLessThan(String value) {
+ addCriterion("createdeptname <", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameLessThanOrEqualTo(String value) {
+ addCriterion("createdeptname <=", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameLike(String value) {
+ addCriterion("createdeptname like", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameNotLike(String value) {
+ addCriterion("createdeptname not like", value, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameIn(List values) {
+ addCriterion("createdeptname in", values, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameNotIn(List values) {
+ addCriterion("createdeptname not in", values, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameBetween(String value1, String value2) {
+ addCriterion("createdeptname between", value1, value2, "createdeptname");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatedeptnameNotBetween(String value1, String value2) {
+ addCriterion("createdeptname not between", value1, value2, "createdeptname");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andLikeQuery(TaskfileInfo record) {
+ List list= new ArrayList();
+ List list2= new ArrayList();
+ StringBuffer buffer=new StringBuffer();
+
+ if(record.getId()!=null&&StrUtil.isNotEmpty(record.getId().toString())) {
+ list.add("ifnull(id,'')");
+ }
+ if(record.getTaskid()!=null&&StrUtil.isNotEmpty(record.getTaskid().toString())) {
+ list.add("ifnull(taskid,'')");
+ }
+ if(record.getFiletype()!=null&&StrUtil.isNotEmpty(record.getFiletype().toString())) {
+ list.add("ifnull(filetype,'')");
+ }
+ if(record.getFilename()!=null&&StrUtil.isNotEmpty(record.getFilename().toString())) {
+ list.add("ifnull(filename,'')");
+ }
+ if(record.getDataId()!=null&&StrUtil.isNotEmpty(record.getDataId().toString())) {
+ list.add("ifnull(data_id,'')");
+ }
+ if(record.getCreateuserid()!=null&&StrUtil.isNotEmpty(record.getCreateuserid().toString())) {
+ list.add("ifnull(createuserid,'')");
+ }
+ if(record.getCreatetime()!=null&&StrUtil.isNotEmpty(record.getCreatetime().toString())) {
+ list.add("ifnull(createtime,'')");
+ }
+ if(record.getCreateusername()!=null&&StrUtil.isNotEmpty(record.getCreateusername().toString())) {
+ list.add("ifnull(createusername,'')");
+ }
+ if(record.getCreatedeptid()!=null&&StrUtil.isNotEmpty(record.getCreatedeptid().toString())) {
+ list.add("ifnull(createdeptid,'')");
+ }
+ if(record.getCreatedeptname()!=null&&StrUtil.isNotEmpty(record.getCreatedeptname().toString())) {
+ list.add("ifnull(createdeptname,'')");
+ }
+ if(record.getId()!=null&&StrUtil.isNotEmpty(record.getId().toString())) {
+ list2.add("'%"+record.getId()+"%'");
+ }
+ if(record.getTaskid()!=null&&StrUtil.isNotEmpty(record.getTaskid().toString())) {
+ list2.add("'%"+record.getTaskid()+"%'");
+ }
+ if(record.getFiletype()!=null&&StrUtil.isNotEmpty(record.getFiletype().toString())) {
+ list2.add("'%"+record.getFiletype()+"%'");
+ }
+ if(record.getFilename()!=null&&StrUtil.isNotEmpty(record.getFilename().toString())) {
+ list2.add("'%"+record.getFilename()+"%'");
+ }
+ if(record.getDataId()!=null&&StrUtil.isNotEmpty(record.getDataId().toString())) {
+ list2.add("'%"+record.getDataId()+"%'");
+ }
+ if(record.getCreateuserid()!=null&&StrUtil.isNotEmpty(record.getCreateuserid().toString())) {
+ list2.add("'%"+record.getCreateuserid()+"%'");
+ }
+ if(record.getCreatetime()!=null&&StrUtil.isNotEmpty(record.getCreatetime().toString())) {
+ list2.add("'%"+record.getCreatetime()+"%'");
+ }
+ if(record.getCreateusername()!=null&&StrUtil.isNotEmpty(record.getCreateusername().toString())) {
+ list2.add("'%"+record.getCreateusername()+"%'");
+ }
+ if(record.getCreatedeptid()!=null&&StrUtil.isNotEmpty(record.getCreatedeptid().toString())) {
+ list2.add("'%"+record.getCreatedeptid()+"%'");
+ }
+ if(record.getCreatedeptname()!=null&&StrUtil.isNotEmpty(record.getCreatedeptname().toString())) {
+ list2.add("'%"+record.getCreatedeptname()+"%'");
+ }
+
+ buffer.append(" CONCAT(");
+ buffer.append(StrUtil.join("",list));
+ buffer.append(")");
+ buffer.append("like CONCAT(");
+
+
+ buffer.append(StrUtil.join("",list2));
+
+ buffer.append(")");
+ if(!" CONCAT()like CONCAT()".equals(buffer.toString())) {
+ addCriterion(buffer.toString());
+ }
+ return (Criteria) this;
+ }
+
+}
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/Taskinfo.java b/src/main/java/com/zsess/taskmanage/model/Taskinfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..73e60e8d6364f0156592bbe4e0c430cdf4175cc3
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/Taskinfo.java
@@ -0,0 +1,317 @@
+package com.zsess.taskmanage.model;
+
+import java.io.Serializable;
+
+import com.fc.test.model.auto.TsysFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.lang.Long;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.lang.Integer;
+import java.util.List;
+
+import static org.springframework.format.annotation.DateTimeFormat.ISO.DATE;
+
+/**
+ * 任务信息主表 Taskinfo
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-06 15:25:56
+ */
+ @ApiModel(value="Taskinfo", description="任务信息主表")
+public class Taskinfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /** 任务ID **/
+ @ApiModelProperty(value = "任务ID")
+ private String taskid;
+
+ /** 任务名称 **/
+ @ApiModelProperty(value = "任务名称")
+ private String taskname;
+
+ /** 任务描述 **/
+ @ApiModelProperty(value = "任务描述")
+ private String taskdesc;
+
+ /** 任务开始日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd", iso= DATE)
+ @ApiModelProperty(value = "任务开始日期")
+ private Date begindate;
+
+ /** 任务完成日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso= DATE)
+ @ApiModelProperty(value = "任务完成日期")
+ private Date enddate;
+
+ /** 汇报频率 **/
+ @ApiModelProperty(value = "汇报频率")
+ private Integer freqid;
+
+ /** 新增时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "新增时间")
+ private Date createtime;
+
+ /** 更新时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updatetime;
+
+ /** 任务发布人 **/
+ @ApiModelProperty(value = "任务发布人")
+ private String userid;
+
+
+
+ /** 任务发布部门 **/
+ @ApiModelProperty(value = "任务发布部门")
+ private Integer deptid;
+ /** 任务接收部门 **/
+ @ApiModelProperty(value = "任务接收部门")
+ private Integer reciveDeptid;
+ /**
+ * 接收部门名称.
+ */
+ private String reciveDeptName;
+
+ /** 任务执行人 **/
+ @ApiModelProperty(value = "任务执行人")
+ private String reciveUserid;
+ /**
+ * 任务执行人名称
+ */
+ private String reciveUserName;
+
+ /** 任务状态ID aoa_status_list.status_id **/
+ @ApiModelProperty(value = "任务状态ID")
+ private Integer statusid;
+ /**
+ * 汇报要求
+ */
+ private String reportdesc;
+
+ /**
+ * 处理过程信息数量。
+ */
+ private Integer processnum;
+ /**
+ * 最新的处理汇报信息
+ */
+ private String processmsg;
+ /**
+ * 状态字符串.
+ */
+ private String statusstr;
+
+ public String getProcessmsg() {
+ return processmsg;
+ }
+
+ public void setProcessmsg(String processmsg) {
+ this.processmsg = processmsg;
+ }
+
+ public Integer getProcessnum() {
+ return processnum;
+ }
+
+ public void setProcessnum(Integer processnum) {
+ this.processnum = processnum;
+ }
+
+ public String getReportdesc() {
+ return reportdesc;
+ }
+
+ public void setReportdesc(String reportdesc) {
+ this.reportdesc = reportdesc;
+ }
+
+ public String getTaskid() {
+ return taskid;
+ }
+
+ public void setTaskid(String taskid) {
+ this.taskid = taskid;
+ }
+
+
+ public String getTaskname() {
+ return taskname;
+ }
+
+ public void setTaskname(String taskname) {
+ this.taskname = taskname;
+ }
+
+
+ public String getTaskdesc() {
+ return taskdesc;
+ }
+
+ public void setTaskdesc(String taskdesc) {
+ this.taskdesc = taskdesc;
+ }
+
+
+ public Date getBegindate() {
+ return begindate;
+ }
+
+ public void setBegindate(Date begindate) {
+ this.begindate = begindate;
+ }
+
+
+ public Date getEnddate() {
+ return enddate;
+ }
+
+ public void setEnddate(Date enddate) {
+ this.enddate = enddate;
+ }
+
+
+ public Integer getFreqid() {
+ return freqid;
+ }
+
+ public void setFreqid(Integer freqid) {
+ this.freqid = freqid;
+ }
+
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+
+ public String getUserid() {
+ return userid;
+ }
+
+ public void setUserid(String userid) {
+ this.userid = userid;
+ }
+
+
+ public Integer getReciveDeptid() {
+ return reciveDeptid;
+ }
+
+ public void setReciveDeptid(Integer reciveDeptid) {
+ this.reciveDeptid = reciveDeptid;
+ }
+
+
+ public String getReciveUserid() {
+ return reciveUserid;
+ }
+
+ public void setReciveUserid(String reciveUserid) {
+ this.reciveUserid = reciveUserid;
+ }
+
+
+ public Integer getStatusid() {
+ return statusid;
+ }
+
+ public void setStatusid(Integer statusid) {
+ this.statusid = statusid;
+ }
+
+
+ public Taskinfo() {
+ super();
+ }
+
+
+ public Taskinfo(String taskid,String taskname,String taskdesc,Date begindate,Date enddate,Integer freqid,
+ Date createtime,Date updatetime,String userid,Integer reciveDeptid,String reciveUserid,
+ Integer statusid, String reportdesc, Integer deptid) {
+
+ this.taskid = taskid;
+ this.taskname = taskname;
+ this.taskdesc = taskdesc;
+ this.begindate = begindate;
+ this.enddate = enddate;
+ this.freqid = freqid;
+ this.createtime = createtime;
+ this.updatetime = updatetime;
+ this.userid = userid;
+ this.reciveDeptid = reciveDeptid;
+ this.reciveUserid = reciveUserid;
+ this.statusid = statusid;
+ this.reportdesc = reportdesc;
+ this.deptid = deptid;
+
+ }
+
+ public String getReciveDeptName() {
+ return reciveDeptName;
+ }
+
+ public void setReciveDeptName(String reciveDeptName) {
+ this.reciveDeptName = reciveDeptName;
+ }
+
+ public String getReciveUserName() {
+ return reciveUserName;
+ }
+
+ public void setReciveUserName(String reciveUserName) {
+ this.reciveUserName = reciveUserName;
+ }
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getStatusstr() {
+ return statusstr;
+ }
+
+ public void setStatusstr(String statusstr) {
+ this.statusstr = statusstr;
+ }
+ // private DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+//
+// public String getBegindateStr() {
+// final String begindateStr = df.format(this.begindate);
+// return begindateStr;
+// }
+//
+// public String getEnddateStr() {
+// final String enddateStr = df.format(this.getEnddate());
+// return enddateStr;
+// }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskinfoCon.java b/src/main/java/com/zsess/taskmanage/model/TaskinfoCon.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b1f1d2d7c9551a44bd374cbbd8ae1f0d21fdbfa
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskinfoCon.java
@@ -0,0 +1,274 @@
+package com.zsess.taskmanage.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 任务信息查询条件对象 TaskinfoCon
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-06 15:25:56
+ */
+ @ApiModel(value="TaskinfoCon", description="任务信息查询条件对象")
+public class TaskinfoCon implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /** 任务ID **/
+ @ApiModelProperty(value = "任务ID")
+ private String taskid;
+
+ /** 任务名称 **/
+ @ApiModelProperty(value = "任务名称")
+ private String taskname;
+
+ /** 任务描述 **/
+ @ApiModelProperty(value = "任务描述")
+ private String taskdesc;
+
+ /** 任务开始日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd", iso= DATE)
+ @ApiModelProperty(value = "任务开始日期")
+ private Date begindate;
+
+ /** 任务完成日期 **/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso= DATE)
+ @ApiModelProperty(value = "任务完成日期")
+ private Date enddate;
+
+ /** 汇报频率 **/
+ @ApiModelProperty(value = "汇报频率")
+ private Integer freqid;
+
+ /** 新增时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "新增时间")
+ private Date createtime;
+
+ /** 更新时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updatetime;
+
+ /** 任务发布人 **/
+ @ApiModelProperty(value = "任务发布人")
+ private String userid;
+
+
+
+ /** 任务发布部门 **/
+ @ApiModelProperty(value = "任务发布部门")
+ private Integer deptid;
+ /** 任务接收部门 **/
+ @ApiModelProperty(value = "任务接收部门")
+ private Integer reciveDeptid;
+ /**
+ * 接收部门名称.
+ */
+ private String reciveDeptName;
+
+ /** 任务执行人 **/
+ @ApiModelProperty(value = "任务执行人")
+ private String reciveUserid;
+ /**
+ * 任务执行人名称
+ */
+ private String reciveUserName;
+
+ /** 任务状态ID aoa_status_list.status_id **/
+ @ApiModelProperty(value = "任务状态ID")
+ private Integer statusid;
+ /**
+ * 任务状态多选.
+ */
+ private String statusstr;
+ /**
+ * 汇报要求
+ */
+ private String reportdesc;
+
+ /**
+ * 处理过程信息数量。
+ */
+ private Integer processnum;
+ /**
+ * 最新的处理汇报信息
+ */
+ private String processmsg;
+
+ public String getProcessmsg() {
+ return processmsg;
+ }
+
+ public void setProcessmsg(String processmsg) {
+ this.processmsg = processmsg;
+ }
+
+ public Integer getProcessnum() {
+ return processnum;
+ }
+
+ public void setProcessnum(Integer processnum) {
+ this.processnum = processnum;
+ }
+
+ public String getReportdesc() {
+ return reportdesc;
+ }
+
+ public void setReportdesc(String reportdesc) {
+ this.reportdesc = reportdesc;
+ }
+
+ public String getTaskid() {
+ return taskid;
+ }
+
+ public void setTaskid(String taskid) {
+ this.taskid = taskid;
+ }
+
+
+ public String getTaskname() {
+ return taskname;
+ }
+
+ public void setTaskname(String taskname) {
+ this.taskname = taskname;
+ }
+
+
+ public String getTaskdesc() {
+ return taskdesc;
+ }
+
+ public void setTaskdesc(String taskdesc) {
+ this.taskdesc = taskdesc;
+ }
+
+
+ public Date getBegindate() {
+ return begindate;
+ }
+
+ public void setBegindate(Date begindate) {
+ this.begindate = begindate;
+ }
+
+
+ public Date getEnddate() {
+ return enddate;
+ }
+
+ public void setEnddate(Date enddate) {
+ this.enddate = enddate;
+ }
+
+
+ public Integer getFreqid() {
+ return freqid;
+ }
+
+ public void setFreqid(Integer freqid) {
+ this.freqid = freqid;
+ }
+
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+
+ public String getUserid() {
+ return userid;
+ }
+
+ public void setUserid(String userid) {
+ this.userid = userid;
+ }
+
+
+ public Integer getReciveDeptid() {
+ return reciveDeptid;
+ }
+
+ public void setReciveDeptid(Integer reciveDeptid) {
+ this.reciveDeptid = reciveDeptid;
+ }
+
+
+ public String getReciveUserid() {
+ return reciveUserid;
+ }
+
+ public void setReciveUserid(String reciveUserid) {
+ this.reciveUserid = reciveUserid;
+ }
+
+
+ public Integer getStatusid() {
+ return statusid;
+ }
+
+ public void setStatusid(Integer statusid) {
+ this.statusid = statusid;
+ }
+
+
+ public TaskinfoCon() {
+ super();
+ }
+
+
+ public String getReciveDeptName() {
+ return reciveDeptName;
+ }
+
+ public void setReciveDeptName(String reciveDeptName) {
+ this.reciveDeptName = reciveDeptName;
+ }
+
+ public String getReciveUserName() {
+ return reciveUserName;
+ }
+
+ public void setReciveUserName(String reciveUserName) {
+ this.reciveUserName = reciveUserName;
+ }
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getStatusstr() {
+ return statusstr;
+ }
+
+ public void setStatusstr(String statusstr) {
+ this.statusstr = statusstr;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskinfoExample.java b/src/main/java/com/zsess/taskmanage/model/TaskinfoExample.java
new file mode 100644
index 0000000000000000000000000000000000000000..239954439b596af5b7ecbb6b3c364794f2e5ee32
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskinfoExample.java
@@ -0,0 +1,1114 @@
+package com.zsess.taskmanage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import cn.hutool.core.util.StrUtil;
+/**
+ * 任务信息主表 TaskinfoExample
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-06 15:25:56
+ */
+public class TaskinfoExample {
+
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List oredCriteria;
+
+ public TaskinfoExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andTaskidIsNull() {
+ addCriterion("taskid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidIsNotNull() {
+ addCriterion("taskid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidEqualTo(String value) {
+ addCriterion("taskid =", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotEqualTo(String value) {
+ addCriterion("taskid <>", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidGreaterThan(String value) {
+ addCriterion("taskid >", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidGreaterThanOrEqualTo(String value) {
+ addCriterion("taskid >=", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLessThan(String value) {
+ addCriterion("taskid <", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLessThanOrEqualTo(String value) {
+ addCriterion("taskid <=", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLike(String value) {
+ addCriterion("taskid like", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotLike(String value) {
+ addCriterion("taskid not like", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidIn(List values) {
+ addCriterion("taskid in", values, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotIn(List values) {
+ addCriterion("taskid not in", values, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidBetween(String value1, String value2) {
+ addCriterion("taskid between", value1, value2, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotBetween(String value1, String value2) {
+ addCriterion("taskid not between", value1, value2, "taskid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andTasknameIsNull() {
+ addCriterion("taskname is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameIsNotNull() {
+ addCriterion("taskname is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameEqualTo(String value) {
+ addCriterion("taskname =", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameNotEqualTo(String value) {
+ addCriterion("taskname <>", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameGreaterThan(String value) {
+ addCriterion("taskname >", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameGreaterThanOrEqualTo(String value) {
+ addCriterion("taskname >=", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameLessThan(String value) {
+ addCriterion("taskname <", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameLessThanOrEqualTo(String value) {
+ addCriterion("taskname <=", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameLike(String value) {
+ addCriterion("taskname like", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameNotLike(String value) {
+ addCriterion("taskname not like", value, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameIn(List values) {
+ addCriterion("taskname in", values, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameNotIn(List values) {
+ addCriterion("taskname not in", values, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameBetween(String value1, String value2) {
+ addCriterion("taskname between", value1, value2, "taskname");
+ return (Criteria) this;
+ }
+
+ public Criteria andTasknameNotBetween(String value1, String value2) {
+ addCriterion("taskname not between", value1, value2, "taskname");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andTaskdescIsNull() {
+ addCriterion("taskdesc is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescIsNotNull() {
+ addCriterion("taskdesc is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescEqualTo(String value) {
+ addCriterion("taskdesc =", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescNotEqualTo(String value) {
+ addCriterion("taskdesc <>", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescGreaterThan(String value) {
+ addCriterion("taskdesc >", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescGreaterThanOrEqualTo(String value) {
+ addCriterion("taskdesc >=", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescLessThan(String value) {
+ addCriterion("taskdesc <", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescLessThanOrEqualTo(String value) {
+ addCriterion("taskdesc <=", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescLike(String value) {
+ addCriterion("taskdesc like", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescNotLike(String value) {
+ addCriterion("taskdesc not like", value, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescIn(List values) {
+ addCriterion("taskdesc in", values, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescNotIn(List values) {
+ addCriterion("taskdesc not in", values, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescBetween(String value1, String value2) {
+ addCriterion("taskdesc between", value1, value2, "taskdesc");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskdescNotBetween(String value1, String value2) {
+ addCriterion("taskdesc not between", value1, value2, "taskdesc");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andBegindateIsNull() {
+ addCriterion("begindate is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateIsNotNull() {
+ addCriterion("begindate is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateEqualTo(Date value) {
+ addCriterion("begindate =", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateNotEqualTo(Date value) {
+ addCriterion("begindate <>", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateGreaterThan(Date value) {
+ addCriterion("begindate >", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateGreaterThanOrEqualTo(Date value) {
+ addCriterion("begindate >=", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateLessThan(Date value) {
+ addCriterion("begindate <", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateLessThanOrEqualTo(Date value) {
+ addCriterion("begindate <=", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateLike(Date value) {
+ addCriterion("begindate like", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateNotLike(Date value) {
+ addCriterion("begindate not like", value, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateIn(List values) {
+ addCriterion("begindate in", values, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateNotIn(List values) {
+ addCriterion("begindate not in", values, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateBetween(Date value1, Date value2) {
+ addCriterion("begindate between", value1, value2, "begindate");
+ return (Criteria) this;
+ }
+
+ public Criteria andBegindateNotBetween(Date value1, Date value2) {
+ addCriterion("begindate not between", value1, value2, "begindate");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andEnddateIsNull() {
+ addCriterion("enddate is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateIsNotNull() {
+ addCriterion("enddate is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateEqualTo(Date value) {
+ addCriterion("enddate =", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateNotEqualTo(Date value) {
+ addCriterion("enddate <>", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateGreaterThan(Date value) {
+ addCriterion("enddate >", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateGreaterThanOrEqualTo(Date value) {
+ addCriterion("enddate >=", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateLessThan(Date value) {
+ addCriterion("enddate <", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateLessThanOrEqualTo(Date value) {
+ addCriterion("enddate <=", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateLike(Date value) {
+ addCriterion("enddate like", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateNotLike(Date value) {
+ addCriterion("enddate not like", value, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateIn(List values) {
+ addCriterion("enddate in", values, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateNotIn(List values) {
+ addCriterion("enddate not in", values, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateBetween(Date value1, Date value2) {
+ addCriterion("enddate between", value1, value2, "enddate");
+ return (Criteria) this;
+ }
+
+ public Criteria andEnddateNotBetween(Date value1, Date value2) {
+ addCriterion("enddate not between", value1, value2, "enddate");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andFreqidIsNull() {
+ addCriterion("freqid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidIsNotNull() {
+ addCriterion("freqid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidEqualTo(Integer value) {
+ addCriterion("freqid =", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidNotEqualTo(Integer value) {
+ addCriterion("freqid <>", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidGreaterThan(Integer value) {
+ addCriterion("freqid >", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("freqid >=", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidLessThan(Integer value) {
+ addCriterion("freqid <", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidLessThanOrEqualTo(Integer value) {
+ addCriterion("freqid <=", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidLike(Long value) {
+ addCriterion("freqid like", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidNotLike(Long value) {
+ addCriterion("freqid not like", value, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidIn(List values) {
+ addCriterion("freqid in", values, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidNotIn(List values) {
+ addCriterion("freqid not in", values, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidBetween(Long value1, Long value2) {
+ addCriterion("freqid between", value1, value2, "freqid");
+ return (Criteria) this;
+ }
+
+ public Criteria andFreqidNotBetween(Integer value1, Integer value2) {
+ addCriterion("freqid not between", value1, value2, "freqid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreatetimeIsNull() {
+ addCriterion("createtime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIsNotNull() {
+ addCriterion("createtime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeEqualTo(Date value) {
+ addCriterion("createtime =", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotEqualTo(Date value) {
+ addCriterion("createtime <>", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThan(Date value) {
+ addCriterion("createtime >", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("createtime >=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThan(Date value) {
+ addCriterion("createtime <", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("createtime <=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLike(Date value) {
+ addCriterion("createtime like", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotLike(Date value) {
+ addCriterion("createtime not like", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIn(List values) {
+ addCriterion("createtime in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotIn(List values) {
+ addCriterion("createtime not in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeBetween(Date value1, Date value2) {
+ addCriterion("createtime between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("createtime not between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andUpdatetimeIsNull() {
+ addCriterion("updatetime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeIsNotNull() {
+ addCriterion("updatetime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeEqualTo(Date value) {
+ addCriterion("updatetime =", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotEqualTo(Date value) {
+ addCriterion("updatetime <>", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeGreaterThan(Date value) {
+ addCriterion("updatetime >", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("updatetime >=", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeLessThan(Date value) {
+ addCriterion("updatetime <", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("updatetime <=", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeLike(Date value) {
+ addCriterion("updatetime like", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotLike(Date value) {
+ addCriterion("updatetime not like", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeIn(List values) {
+ addCriterion("updatetime in", values, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotIn(List values) {
+ addCriterion("updatetime not in", values, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+ addCriterion("updatetime between", value1, value2, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("updatetime not between", value1, value2, "updatetime");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andUseridIsNull() {
+ addCriterion("userid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridIsNotNull() {
+ addCriterion("userid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridEqualTo(String value) {
+ addCriterion("userid =", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotEqualTo(String value) {
+ addCriterion("userid <>", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridGreaterThan(String value) {
+ addCriterion("userid >", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridGreaterThanOrEqualTo(String value) {
+ addCriterion("userid >=", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridLessThan(String value) {
+ addCriterion("userid <", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridLessThanOrEqualTo(String value) {
+ addCriterion("userid <=", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridLike(String value) {
+ addCriterion("userid like", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotLike(String value) {
+ addCriterion("userid not like", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridIn(List values) {
+ addCriterion("userid in", values, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotIn(List values) {
+ addCriterion("userid not in", values, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridBetween(String value1, String value2) {
+ addCriterion("userid between", value1, value2, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotBetween(String value1, String value2) {
+ addCriterion("userid not between", value1, value2, "userid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andReciveDeptidIsNull() {
+ addCriterion("recive_deptid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidIsNotNull() {
+ addCriterion("recive_deptid is not null");
+ return (Criteria) this;
+ }
+
+
+
+ public Criteria andReciveDeptidEqualTo(Integer value) {
+ addCriterion("recive_deptid =", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidNotEqualTo(Integer value) {
+ addCriterion("recive_deptid <>", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidGreaterThan(Integer value) {
+ addCriterion("recive_deptid >", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("recive_deptid >=", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidLessThan(Integer value) {
+ addCriterion("recive_deptid <", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidLessThanOrEqualTo(Integer value) {
+ addCriterion("recive_deptid <=", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidLike(Integer value) {
+ addCriterion("recive_deptid like", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidNotLike(Integer value) {
+ addCriterion("recive_deptid not like", value, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidIn(List values) {
+ addCriterion("recive_deptid in", values, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidNotIn(List values) {
+ addCriterion("recive_deptid not in", values, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidBetween(Integer value1, Integer value2) {
+ addCriterion("recive_deptid between", value1, value2, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveDeptidNotBetween(Integer value1, Integer value2) {
+ addCriterion("recive_deptid not between", value1, value2, "reciveDeptid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andReciveUseridIsNull() {
+ addCriterion("recive_userid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridIsNotNull() {
+ addCriterion("recive_userid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridEqualTo(String value) {
+ addCriterion("recive_userid =", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridNotEqualTo(String value) {
+ addCriterion("recive_userid <>", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridGreaterThan(String value) {
+ addCriterion("recive_userid >", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridGreaterThanOrEqualTo(String value) {
+ addCriterion("recive_userid >=", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridLessThan(String value) {
+ addCriterion("recive_userid <", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridLessThanOrEqualTo(String value) {
+ addCriterion("recive_userid <=", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridLike(String value) {
+ addCriterion("recive_userid like", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridNotLike(String value) {
+ addCriterion("recive_userid not like", value, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridIn(List values) {
+ addCriterion("recive_userid in", values, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridNotIn(List values) {
+ addCriterion("recive_userid not in", values, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridBetween(String value1, String value2) {
+ addCriterion("recive_userid between", value1, value2, "reciveUserid");
+ return (Criteria) this;
+ }
+
+ public Criteria andReciveUseridNotBetween(String value1, String value2) {
+ addCriterion("recive_userid not between", value1, value2, "reciveUserid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andStatusidIsNull() {
+ addCriterion("statusid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidIsNotNull() {
+ addCriterion("statusid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidEqualTo(Integer value) {
+ addCriterion("statusid =", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotEqualTo(Integer value) {
+ addCriterion("statusid <>", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidGreaterThan(Integer value) {
+ addCriterion("statusid >", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("statusid >=", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidLessThan(Integer value) {
+ addCriterion("statusid <", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidLessThanOrEqualTo(Integer value) {
+ addCriterion("statusid <=", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidLike(Integer value) {
+ addCriterion("statusid like", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotLike(Integer value) {
+ addCriterion("statusid not like", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidIn(List values) {
+ addCriterion("statusid in", values, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotIn(List values) {
+ addCriterion("statusid not in", values, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidBetween(Integer value1, Integer value2) {
+ addCriterion("statusid between", value1, value2, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotBetween(Integer value1, Integer value2) {
+ addCriterion("statusid not between", value1, value2, "statusid");
+ return (Criteria) this;
+ }
+ public Criteria andDeptidEqualTo(Integer value) {
+ addCriterion("deptid =", value, "deptid");
+ return (Criteria) this;
+ }
+ public Criteria andDeptidIn(List values) {
+ addCriterion("deptid in", values, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDeptidNotIn(List values) {
+ addCriterion("deptid not in", values, "deptid");
+ return (Criteria) this;
+ }
+
+ public Criteria andLikeQuery(Taskinfo record) {
+ List list= new ArrayList();
+ List list2= new ArrayList();
+ StringBuffer buffer=new StringBuffer();
+
+ if(record.getTaskname()!=null&&StrUtil.isNotEmpty(record.getTaskname().toString())) {
+ list.add("ifnull(taskname,'')");
+ }
+ if(record.getTaskdesc()!=null&&StrUtil.isNotEmpty(record.getTaskdesc().toString())) {
+ list.add("ifnull(taskdesc,'')");
+ }
+ if(record.getReportdesc()!=null&&StrUtil.isNotEmpty(record.getReportdesc().toString())) {
+ list.add("ifnull(reportdesc,'')");
+ }
+
+ if(record.getTaskname()!=null&&StrUtil.isNotEmpty(record.getTaskname().toString())) {
+ list2.add("'%"+record.getTaskname()+"%'");
+ }
+ if(record.getTaskdesc()!=null&&StrUtil.isNotEmpty(record.getTaskdesc().toString())) {
+ list2.add("'%"+record.getTaskdesc()+"%'");
+ }
+ if(record.getReportdesc()!=null&&StrUtil.isNotEmpty(record.getReportdesc().toString())) {
+ list2.add("'%"+record.getReportdesc()+"%'");
+ }
+ buffer.append(" CONCAT(");
+ buffer.append(StrUtil.join("",list));
+ buffer.append(")");
+ buffer.append("like CONCAT(");
+
+
+ buffer.append(StrUtil.join("",list2));
+
+ buffer.append(")");
+ if(!" CONCAT()like CONCAT()".equals(buffer.toString())) {
+ addCriterion(buffer.toString());
+ }
+ return (Criteria) this;
+ }
+
+}
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskprocessInfo.java b/src/main/java/com/zsess/taskmanage/model/TaskprocessInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..85a8d8063855a65382bd50d530088f378b97b52d
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskprocessInfo.java
@@ -0,0 +1,184 @@
+package com.zsess.taskmanage.model;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.lang.Integer;
+
+/**
+ * 任务管理执行过程信息 TaskprocessInfo
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-15 10:42:35
+ */
+ @ApiModel(value="TaskprocessInfo", description="任务管理执行过程信息")
+public class TaskprocessInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+
+ /** 任务处理过程id **/
+ @ApiModelProperty(value = "任务处理过程id")
+ private String processid;
+
+ /** 任务id **/
+ @ApiModelProperty(value = "任务id")
+ private String taskid;
+
+ /** 处理部门id **/
+ @ApiModelProperty(value = "处理部门id")
+ private Integer detpid;
+ /**
+ * 部门名称
+ */
+ private String deptname;
+ /** 处理人员id **/
+ @ApiModelProperty(value = "处理人员id")
+ private String userid;
+ /**
+ * 处理人员名称
+ */
+ private String username;
+
+ /** 新增处理时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "新增处理时间")
+ private Date createtime;
+
+ /** 更新时间 **/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @ApiModelProperty(value = "更新时间")
+ private Date updatetime;
+
+ /** 任务状态id **/
+ @ApiModelProperty(value = "任务状态id")
+ private Integer statusid;
+
+ /** 任务处理信息说明 **/
+ @ApiModelProperty(value = "任务处理信息说明")
+ private String processmsg;
+
+ /** 任务处理信息状态 0 无效,1有效 **/
+ @ApiModelProperty(value = "任务处理信息状态 0 无效,1有效")
+ private Integer processstatus;
+
+
+ public String getProcessid() {
+ return processid;
+ }
+
+ public void setProcessid(String processid) {
+ this.processid = processid;
+ }
+
+
+ public String getTaskid() {
+ return taskid;
+ }
+
+ public void setTaskid(String taskid) {
+ this.taskid = taskid;
+ }
+
+
+ public Integer getDetpid() {
+ return detpid;
+ }
+
+ public void setDetpid(Integer detpid) {
+ this.detpid = detpid;
+ }
+
+
+ public String getUserid() {
+ return userid;
+ }
+
+ public void setUserid(String userid) {
+ this.userid = userid;
+ }
+
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+
+ public Integer getStatusid() {
+ return statusid;
+ }
+
+ public void setStatusid(Integer statusid) {
+ this.statusid = statusid;
+ }
+
+
+ public String getProcessmsg() {
+ return processmsg;
+ }
+
+ public void setProcessmsg(String processmsg) {
+ this.processmsg = processmsg;
+ }
+
+
+ public Integer getProcessstatus() {
+ return processstatus;
+ }
+
+ public void setProcessstatus(Integer processstatus) {
+ this.processstatus = processstatus;
+ }
+
+
+ public TaskprocessInfo() {
+ super();
+ }
+
+
+ public TaskprocessInfo(String processid,String taskid,Integer detpid,String userid,Date createtime,Date updatetime,Integer statusid,String processmsg,Integer processstatus) {
+
+ this.processid = processid;
+ this.taskid = taskid;
+ this.detpid = detpid;
+ this.userid = userid;
+ this.createtime = createtime;
+ this.updatetime = updatetime;
+ this.statusid = statusid;
+ this.processmsg = processmsg;
+ this.processstatus = processstatus;
+
+ }
+
+ public String getDeptname() {
+ return deptname;
+ }
+
+ public void setDeptname(String deptname) {
+ this.deptname = deptname;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/TaskprocessInfoExample.java b/src/main/java/com/zsess/taskmanage/model/TaskprocessInfoExample.java
new file mode 100644
index 0000000000000000000000000000000000000000..feddb90bb27858501fe0191439d69afb8ac92dd5
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/TaskprocessInfoExample.java
@@ -0,0 +1,923 @@
+package com.zsess.taskmanage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import cn.hutool.core.util.StrUtil;
+/**
+ * 任务管理执行过程信息 TaskprocessInfoExample
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-15 10:42:35
+ */
+public class TaskprocessInfoExample {
+
+ protected String orderByClause;
+
+ protected boolean distinct;
+
+ protected List oredCriteria;
+
+ public TaskprocessInfoExample() {
+ oredCriteria = new ArrayList();
+ }
+
+ public void setOrderByClause(String orderByClause) {
+ this.orderByClause = orderByClause;
+ }
+
+ public String getOrderByClause() {
+ return orderByClause;
+ }
+
+ public void setDistinct(boolean distinct) {
+ this.distinct = distinct;
+ }
+
+ public boolean isDistinct() {
+ return distinct;
+ }
+
+ public List getOredCriteria() {
+ return oredCriteria;
+ }
+
+ public void or(Criteria criteria) {
+ oredCriteria.add(criteria);
+ }
+
+ public Criteria or() {
+ Criteria criteria = createCriteriaInternal();
+ oredCriteria.add(criteria);
+ return criteria;
+ }
+
+ public Criteria createCriteria() {
+ Criteria criteria = createCriteriaInternal();
+ if (oredCriteria.size() == 0) {
+ oredCriteria.add(criteria);
+ }
+ return criteria;
+ }
+
+ protected Criteria createCriteriaInternal() {
+ Criteria criteria = new Criteria();
+ return criteria;
+ }
+
+ public void clear() {
+ oredCriteria.clear();
+ orderByClause = null;
+ distinct = false;
+ }
+
+ protected abstract static class GeneratedCriteria {
+ protected List criteria;
+
+ protected GeneratedCriteria() {
+ super();
+ criteria = new ArrayList();
+ }
+
+ public boolean isValid() {
+ return criteria.size() > 0;
+ }
+
+ public List getAllCriteria() {
+ return criteria;
+ }
+
+ public List getCriteria() {
+ return criteria;
+ }
+
+ protected void addCriterion(String condition) {
+ if (condition == null) {
+ throw new RuntimeException("Value for condition cannot be null");
+ }
+ criteria.add(new Criterion(condition));
+ }
+
+ protected void addCriterion(String condition, Object value, String property) {
+ if (value == null) {
+ throw new RuntimeException("Value for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value));
+ }
+
+ protected void addCriterion(String condition, Object value1, Object value2, String property) {
+ if (value1 == null || value2 == null) {
+ throw new RuntimeException("Between values for " + property + " cannot be null");
+ }
+ criteria.add(new Criterion(condition, value1, value2));
+ }
+
+ public Criteria andProcessidIsNull() {
+ addCriterion("processid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidIsNotNull() {
+ addCriterion("processid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidEqualTo(String value) {
+ addCriterion("processid =", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidNotEqualTo(String value) {
+ addCriterion("processid <>", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidGreaterThan(String value) {
+ addCriterion("processid >", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidGreaterThanOrEqualTo(String value) {
+ addCriterion("processid >=", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidLessThan(String value) {
+ addCriterion("processid <", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidLessThanOrEqualTo(String value) {
+ addCriterion("processid <=", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidLike(String value) {
+ addCriterion("processid like", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidNotLike(String value) {
+ addCriterion("processid not like", value, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidIn(List values) {
+ addCriterion("processid in", values, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidNotIn(List values) {
+ addCriterion("processid not in", values, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidBetween(String value1, String value2) {
+ addCriterion("processid between", value1, value2, "processid");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessidNotBetween(String value1, String value2) {
+ addCriterion("processid not between", value1, value2, "processid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andTaskidIsNull() {
+ addCriterion("taskid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidIsNotNull() {
+ addCriterion("taskid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidEqualTo(String value) {
+ addCriterion("taskid =", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotEqualTo(String value) {
+ addCriterion("taskid <>", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidGreaterThan(String value) {
+ addCriterion("taskid >", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidGreaterThanOrEqualTo(String value) {
+ addCriterion("taskid >=", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLessThan(String value) {
+ addCriterion("taskid <", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLessThanOrEqualTo(String value) {
+ addCriterion("taskid <=", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidLike(String value) {
+ addCriterion("taskid like", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotLike(String value) {
+ addCriterion("taskid not like", value, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidIn(List values) {
+ addCriterion("taskid in", values, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotIn(List values) {
+ addCriterion("taskid not in", values, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidBetween(String value1, String value2) {
+ addCriterion("taskid between", value1, value2, "taskid");
+ return (Criteria) this;
+ }
+
+ public Criteria andTaskidNotBetween(String value1, String value2) {
+ addCriterion("taskid not between", value1, value2, "taskid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andDetpidIsNull() {
+ addCriterion("detpid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidIsNotNull() {
+ addCriterion("detpid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidEqualTo(Integer value) {
+ addCriterion("detpid =", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidNotEqualTo(Integer value) {
+ addCriterion("detpid <>", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidGreaterThan(Integer value) {
+ addCriterion("detpid >", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("detpid >=", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidLessThan(Integer value) {
+ addCriterion("detpid <", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidLessThanOrEqualTo(Integer value) {
+ addCriterion("detpid <=", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidLike(Integer value) {
+ addCriterion("detpid like", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidNotLike(Integer value) {
+ addCriterion("detpid not like", value, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidIn(List values) {
+ addCriterion("detpid in", values, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidNotIn(List values) {
+ addCriterion("detpid not in", values, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidBetween(Integer value1, Integer value2) {
+ addCriterion("detpid between", value1, value2, "detpid");
+ return (Criteria) this;
+ }
+
+ public Criteria andDetpidNotBetween(Integer value1, Integer value2) {
+ addCriterion("detpid not between", value1, value2, "detpid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andUseridIsNull() {
+ addCriterion("userid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridIsNotNull() {
+ addCriterion("userid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridEqualTo(String value) {
+ addCriterion("userid =", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotEqualTo(String value) {
+ addCriterion("userid <>", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridGreaterThan(String value) {
+ addCriterion("userid >", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridGreaterThanOrEqualTo(String value) {
+ addCriterion("userid >=", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridLessThan(String value) {
+ addCriterion("userid <", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridLessThanOrEqualTo(String value) {
+ addCriterion("userid <=", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridLike(String value) {
+ addCriterion("userid like", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotLike(String value) {
+ addCriterion("userid not like", value, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridIn(List values) {
+ addCriterion("userid in", values, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotIn(List values) {
+ addCriterion("userid not in", values, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridBetween(String value1, String value2) {
+ addCriterion("userid between", value1, value2, "userid");
+ return (Criteria) this;
+ }
+
+ public Criteria andUseridNotBetween(String value1, String value2) {
+ addCriterion("userid not between", value1, value2, "userid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andCreatetimeIsNull() {
+ addCriterion("createtime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIsNotNull() {
+ addCriterion("createtime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeEqualTo(Date value) {
+ addCriterion("createtime =", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotEqualTo(Date value) {
+ addCriterion("createtime <>", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThan(Date value) {
+ addCriterion("createtime >", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("createtime >=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThan(Date value) {
+ addCriterion("createtime <", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("createtime <=", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeLike(Date value) {
+ addCriterion("createtime like", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotLike(Date value) {
+ addCriterion("createtime not like", value, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeIn(List values) {
+ addCriterion("createtime in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotIn(List values) {
+ addCriterion("createtime not in", values, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeBetween(Date value1, Date value2) {
+ addCriterion("createtime between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+ public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("createtime not between", value1, value2, "createtime");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andUpdatetimeIsNull() {
+ addCriterion("updatetime is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeIsNotNull() {
+ addCriterion("updatetime is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeEqualTo(Date value) {
+ addCriterion("updatetime =", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotEqualTo(Date value) {
+ addCriterion("updatetime <>", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeGreaterThan(Date value) {
+ addCriterion("updatetime >", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+ addCriterion("updatetime >=", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeLessThan(Date value) {
+ addCriterion("updatetime <", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+ addCriterion("updatetime <=", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeLike(Date value) {
+ addCriterion("updatetime like", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotLike(Date value) {
+ addCriterion("updatetime not like", value, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeIn(List values) {
+ addCriterion("updatetime in", values, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotIn(List values) {
+ addCriterion("updatetime not in", values, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+ addCriterion("updatetime between", value1, value2, "updatetime");
+ return (Criteria) this;
+ }
+
+ public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+ addCriterion("updatetime not between", value1, value2, "updatetime");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andStatusidIsNull() {
+ addCriterion("statusid is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidIsNotNull() {
+ addCriterion("statusid is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidEqualTo(Integer value) {
+ addCriterion("statusid =", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotEqualTo(Integer value) {
+ addCriterion("statusid <>", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidGreaterThan(Integer value) {
+ addCriterion("statusid >", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidGreaterThanOrEqualTo(Integer value) {
+ addCriterion("statusid >=", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidLessThan(Integer value) {
+ addCriterion("statusid <", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidLessThanOrEqualTo(Integer value) {
+ addCriterion("statusid <=", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidLike(Integer value) {
+ addCriterion("statusid like", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotLike(Integer value) {
+ addCriterion("statusid not like", value, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidIn(List values) {
+ addCriterion("statusid in", values, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotIn(List values) {
+ addCriterion("statusid not in", values, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidBetween(Integer value1, Integer value2) {
+ addCriterion("statusid between", value1, value2, "statusid");
+ return (Criteria) this;
+ }
+
+ public Criteria andStatusidNotBetween(Integer value1, Integer value2) {
+ addCriterion("statusid not between", value1, value2, "statusid");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andProcessmsgIsNull() {
+ addCriterion("processmsg is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgIsNotNull() {
+ addCriterion("processmsg is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgEqualTo(String value) {
+ addCriterion("processmsg =", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgNotEqualTo(String value) {
+ addCriterion("processmsg <>", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgGreaterThan(String value) {
+ addCriterion("processmsg >", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgGreaterThanOrEqualTo(String value) {
+ addCriterion("processmsg >=", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgLessThan(String value) {
+ addCriterion("processmsg <", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgLessThanOrEqualTo(String value) {
+ addCriterion("processmsg <=", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgLike(String value) {
+ addCriterion("processmsg like", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgNotLike(String value) {
+ addCriterion("processmsg not like", value, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgIn(List values) {
+ addCriterion("processmsg in", values, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgNotIn(List values) {
+ addCriterion("processmsg not in", values, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgBetween(String value1, String value2) {
+ addCriterion("processmsg between", value1, value2, "processmsg");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessmsgNotBetween(String value1, String value2) {
+ addCriterion("processmsg not between", value1, value2, "processmsg");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andProcessstatusIsNull() {
+ addCriterion("processstatus is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusIsNotNull() {
+ addCriterion("processstatus is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusEqualTo(Integer value) {
+ addCriterion("processstatus =", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusNotEqualTo(Integer value) {
+ addCriterion("processstatus <>", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusGreaterThan(Integer value) {
+ addCriterion("processstatus >", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusGreaterThanOrEqualTo(Integer value) {
+ addCriterion("processstatus >=", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusLessThan(Integer value) {
+ addCriterion("processstatus <", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusLessThanOrEqualTo(Integer value) {
+ addCriterion("processstatus <=", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusLike(Integer value) {
+ addCriterion("processstatus like", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusNotLike(Integer value) {
+ addCriterion("processstatus not like", value, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusIn(List values) {
+ addCriterion("processstatus in", values, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusNotIn(List values) {
+ addCriterion("processstatus not in", values, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusBetween(Integer value1, Integer value2) {
+ addCriterion("processstatus between", value1, value2, "processstatus");
+ return (Criteria) this;
+ }
+
+ public Criteria andProcessstatusNotBetween(Integer value1, Integer value2) {
+ addCriterion("processstatus not between", value1, value2, "processstatus");
+ return (Criteria) this;
+ }
+
+
+ public Criteria andLikeQuery(TaskprocessInfo record) {
+ List list= new ArrayList();
+ List list2= new ArrayList();
+ StringBuffer buffer=new StringBuffer();
+
+ if(record.getProcessid()!=null&&StrUtil.isNotEmpty(record.getProcessid().toString())) {
+ list.add("ifnull(processid,'')");
+ }
+ if(record.getTaskid()!=null&&StrUtil.isNotEmpty(record.getTaskid().toString())) {
+ list.add("ifnull(taskid,'')");
+ }
+ if(record.getDetpid()!=null&&StrUtil.isNotEmpty(record.getDetpid().toString())) {
+ list.add("ifnull(detpid,'')");
+ }
+ if(record.getUserid()!=null&&StrUtil.isNotEmpty(record.getUserid().toString())) {
+ list.add("ifnull(userid,'')");
+ }
+ if(record.getCreatetime()!=null&&StrUtil.isNotEmpty(record.getCreatetime().toString())) {
+ list.add("ifnull(createtime,'')");
+ }
+ if(record.getUpdatetime()!=null&&StrUtil.isNotEmpty(record.getUpdatetime().toString())) {
+ list.add("ifnull(updatetime,'')");
+ }
+ if(record.getStatusid()!=null&&StrUtil.isNotEmpty(record.getStatusid().toString())) {
+ list.add("ifnull(statusid,'')");
+ }
+ if(record.getProcessmsg()!=null&&StrUtil.isNotEmpty(record.getProcessmsg().toString())) {
+ list.add("ifnull(processmsg,'')");
+ }
+ if(record.getProcessstatus()!=null&&StrUtil.isNotEmpty(record.getProcessstatus().toString())) {
+ list.add("ifnull(processstatus,'')");
+ }
+ if(record.getProcessid()!=null&&StrUtil.isNotEmpty(record.getProcessid().toString())) {
+ list2.add("'%"+record.getProcessid()+"%'");
+ }
+ if(record.getTaskid()!=null&&StrUtil.isNotEmpty(record.getTaskid().toString())) {
+ list2.add("'%"+record.getTaskid()+"%'");
+ }
+ if(record.getDetpid()!=null&&StrUtil.isNotEmpty(record.getDetpid().toString())) {
+ list2.add("'%"+record.getDetpid()+"%'");
+ }
+ if(record.getUserid()!=null&&StrUtil.isNotEmpty(record.getUserid().toString())) {
+ list2.add("'%"+record.getUserid()+"%'");
+ }
+ if(record.getCreatetime()!=null&&StrUtil.isNotEmpty(record.getCreatetime().toString())) {
+ list2.add("'%"+record.getCreatetime()+"%'");
+ }
+ if(record.getUpdatetime()!=null&&StrUtil.isNotEmpty(record.getUpdatetime().toString())) {
+ list2.add("'%"+record.getUpdatetime()+"%'");
+ }
+ if(record.getStatusid()!=null&&StrUtil.isNotEmpty(record.getStatusid().toString())) {
+ list2.add("'%"+record.getStatusid()+"%'");
+ }
+ if(record.getProcessmsg()!=null&&StrUtil.isNotEmpty(record.getProcessmsg().toString())) {
+ list2.add("'%"+record.getProcessmsg()+"%'");
+ }
+ if(record.getProcessstatus()!=null&&StrUtil.isNotEmpty(record.getProcessstatus().toString())) {
+ list2.add("'%"+record.getProcessstatus()+"%'");
+ }
+
+ buffer.append(" CONCAT(");
+ buffer.append(StrUtil.join("",list));
+ buffer.append(")");
+ buffer.append("like CONCAT(");
+
+
+ buffer.append(StrUtil.join("",list2));
+
+ buffer.append(")");
+ if(!" CONCAT()like CONCAT()".equals(buffer.toString())) {
+ addCriterion(buffer.toString());
+ }
+ return (Criteria) this;
+ }
+
+}
+
+ public static class Criteria extends GeneratedCriteria {
+
+ protected Criteria() {
+ super();
+ }
+ }
+
+ public static class Criterion {
+ private String condition;
+
+ private Object value;
+
+ private Object secondValue;
+
+ private boolean noValue;
+
+ private boolean singleValue;
+
+ private boolean betweenValue;
+
+ private boolean listValue;
+
+ private String typeHandler;
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public Object getSecondValue() {
+ return secondValue;
+ }
+
+ public boolean isNoValue() {
+ return noValue;
+ }
+
+ public boolean isSingleValue() {
+ return singleValue;
+ }
+
+ public boolean isBetweenValue() {
+ return betweenValue;
+ }
+
+ public boolean isListValue() {
+ return listValue;
+ }
+
+ public String getTypeHandler() {
+ return typeHandler;
+ }
+
+ protected Criterion(String condition) {
+ super();
+ this.condition = condition;
+ this.typeHandler = null;
+ this.noValue = true;
+ }
+
+ protected Criterion(String condition, Object value, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.typeHandler = typeHandler;
+ if (value instanceof List>) {
+ this.listValue = true;
+ } else {
+ this.singleValue = true;
+ }
+ }
+
+ protected Criterion(String condition, Object value) {
+ this(condition, value, null);
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+ super();
+ this.condition = condition;
+ this.value = value;
+ this.secondValue = secondValue;
+ this.typeHandler = typeHandler;
+ this.betweenValue = true;
+ }
+
+ protected Criterion(String condition, Object value, Object secondValue) {
+ this(condition, value, secondValue, null);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zsess/taskmanage/model/common/CommonIdNameBo.java b/src/main/java/com/zsess/taskmanage/model/common/CommonIdNameBo.java
new file mode 100644
index 0000000000000000000000000000000000000000..57c238fecb7bac79dbab4b0e975d3bd941b00fdb
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/model/common/CommonIdNameBo.java
@@ -0,0 +1,33 @@
+package com.zsess.taskmanage.model.common;
+
+import java.io.Serializable;
+
+public class CommonIdNameBo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String id;
+
+ private String name;
+
+ public CommonIdNameBo(String id, String text) {
+ this.id = id;
+ this.name = text;
+ }
+
+ 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;
+ }
+}
diff --git a/src/main/java/com/zsess/taskmanage/service/DeptTaskInfoService.java b/src/main/java/com/zsess/taskmanage/service/DeptTaskInfoService.java
new file mode 100644
index 0000000000000000000000000000000000000000..40ed9df68dbcfbc126193456686e2ef24ff2002a
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/service/DeptTaskInfoService.java
@@ -0,0 +1,42 @@
+package com.zsess.taskmanage.service;
+
+import com.zsess.taskmanage.mapper.DeptTaskInfoDao;
+import com.zsess.taskmanage.model.DeptTaskInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class DeptTaskInfoService {
+ /**
+ * 日志
+ */
+ private static Logger logger = LoggerFactory.getLogger(DeptTaskInfoService.class);
+ @Resource
+ private DeptTaskInfoDao deptTaskInfoDao;
+
+ /**
+ * 获取所有部门待处理任务数.
+ * @return
+ */
+ public ListgetDeptExeTaskInfoForControl() {
+ logger.info("获取部门待处理的任务数量");
+ final List deptAddtaskInfo = deptTaskInfoDao.getDeptAddtaskInfo();
+ final List deptExetaskInfo = deptTaskInfoDao.getDeptExetaskInfo();
+ deptAddtaskInfo.addAll(deptExetaskInfo);
+ return deptAddtaskInfo;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public ListgetDeptTaskCompleteNum() {
+ logger.info("获取部门已处理完成的任务数量");
+ final List depttaskCompleteNum = deptTaskInfoDao.getDeptTaskCompleteNum();
+ return depttaskCompleteNum;
+ }
+}
diff --git a/src/main/java/com/zsess/taskmanage/service/TaskManageComService.java b/src/main/java/com/zsess/taskmanage/service/TaskManageComService.java
new file mode 100644
index 0000000000000000000000000000000000000000..cb8d86111604b3d5d78dfd16bfc143000cc2b4ea
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/service/TaskManageComService.java
@@ -0,0 +1,66 @@
+package com.zsess.taskmanage.service;
+
+import com.zsess.taskmanage.model.TaskStatus;
+import com.zsess.taskmanage.model.common.CommonIdNameBo;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *通过服务
+ */
+@Service
+public class TaskManageComService {
+ /**
+ * 获取任务状态数据.
+ * @return getTaskStatusList .
+ */
+ public List getTaskStatusList() {
+
+ final List taskStatusList = new ArrayList();
+
+ final CommonIdNameBo status0 = new CommonIdNameBo(String.valueOf(TaskStatus.ADD.getIndex()),TaskStatus.ADD.getName());
+ taskStatusList.add(status0);
+ final CommonIdNameBo status1 = new CommonIdNameBo(String.valueOf(TaskStatus.ASSIGN.getIndex()),TaskStatus.ASSIGN.getName());;
+ taskStatusList.add(status1);
+ final CommonIdNameBo status2 = new CommonIdNameBo(String.valueOf(TaskStatus.ASSIGNCONFIRM.getIndex()),TaskStatus.ASSIGNCONFIRM.getName());
+ taskStatusList.add(status2);
+ final CommonIdNameBo status3 = new CommonIdNameBo(String.valueOf(TaskStatus.ASSIGNBACK.getIndex()),TaskStatus.ASSIGNBACK.getName());
+ taskStatusList.add(status3);
+ final CommonIdNameBo status4 = new CommonIdNameBo(String.valueOf(TaskStatus.ACCEPTED.getIndex()),TaskStatus.ACCEPTED.getName());
+ taskStatusList.add(status4);
+ final CommonIdNameBo status5 = new CommonIdNameBo(String.valueOf(TaskStatus.EXECUTING.getIndex()),TaskStatus.EXECUTING.getName());
+ taskStatusList.add(status5);
+ final CommonIdNameBo status6 = new CommonIdNameBo(String.valueOf(TaskStatus.COMPLETEAPPLY.getIndex()),TaskStatus.COMPLETEAPPLY.getName());
+ taskStatusList.add(status6);
+ final CommonIdNameBo status7 = new CommonIdNameBo(String.valueOf(TaskStatus.COMPLETED.getIndex()),TaskStatus.COMPLETED.getName());
+ taskStatusList.add(status7);
+ final CommonIdNameBo status8 = new CommonIdNameBo(String.valueOf(TaskStatus.COMPLETEBACK.getIndex()),TaskStatus.COMPLETEBACK.getName());
+ taskStatusList.add(status8);
+
+ return taskStatusList;
+ }
+
+ /**
+ * 获取任务汇报频率ID名称数据集.
+ * @return
+ */
+ public List getTaskFreqList() {
+ final List taskFreqList = new ArrayList();
+ final CommonIdNameBo freq0 = new CommonIdNameBo("0","天");
+ taskFreqList.add(freq0);
+ final CommonIdNameBo freq1 = new CommonIdNameBo("1","周");
+ taskFreqList.add(freq1);
+ final CommonIdNameBo freq2 = new CommonIdNameBo("2","月");
+ taskFreqList.add(freq2);
+ final CommonIdNameBo freq3 = new CommonIdNameBo("3","季");
+ taskFreqList.add(freq3);
+ final CommonIdNameBo freq4 = new CommonIdNameBo("4","年");
+ taskFreqList.add(freq4);
+ return taskFreqList;
+ }
+
+
+
+}
diff --git a/src/main/java/com/zsess/taskmanage/service/TaskfileInfoService.java b/src/main/java/com/zsess/taskmanage/service/TaskfileInfoService.java
new file mode 100644
index 0000000000000000000000000000000000000000..daad80bf8fd79a904025f510ee32c169b91fe947
--- /dev/null
+++ b/src/main/java/com/zsess/taskmanage/service/TaskfileInfoService.java
@@ -0,0 +1,245 @@
+package com.zsess.taskmanage.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fc.test.common.base.BaseService;
+import com.fc.test.common.support.ConvertUtil;
+import com.fc.test.mapper.auto.TsysDatasMapper;
+import com.fc.test.mapper.custom.TsysDatasDao;
+import com.fc.test.model.auto.TsysDatas;
+import com.fc.test.model.auto.TsysUser;
+import com.fc.test.model.custom.Tablepar;
+import com.fc.test.service.SysFileService;
+import com.fc.test.shiro.util.ShiroUtils;
+import com.fc.test.util.SnowflakeIdWorker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import cn.hutool.core.util.StrUtil;
+import com.zsess.taskmanage.mapper.TaskfileInfoMapper;
+import com.zsess.taskmanage.model.TaskfileInfo;
+import com.zsess.taskmanage.model.TaskfileInfoExample;
+import com.fc.test.util.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * 任务管理附件信息表 TaskfileInfoService
+ * @Title: TaskfileInfoService.java
+ * @Package com.zsess.taskmanage.service
+ * @author mian_自动生成
+ * @email mianli85@163.com
+ * @date 2020-07-16 15:39:49
+ **/
+@Service
+public class TaskfileInfoService implements BaseService {
+ /**
+ * 日志
+ */
+ private static Logger logger = LoggerFactory.getLogger(TaskfileInfoService.class);
+
+ @Resource
+ private TaskfileInfoMapper taskfileInfoMapper;
+
+ @Resource
+ private TsysDatasDao tsysDatasDao;
+ @Resource
+ private SysFileService sysFileService;
+ //文件存储mapper
+ @Resource
+ private TsysDatasMapper tsysDatasMapper;
+ /**
+ * 分页查询
+ * @param tablepar
+ * @param record
+ * @return
+ */
+ public PageInfo list(Tablepar tablepar, TaskfileInfo record){
+ TaskfileInfoExample testExample=new TaskfileInfoExample();
+ testExample.createCriteria().andLikeQuery(record);
+ testExample.setOrderByClause("id ASC");
+ if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) {
+ testExample.setOrderByClause(StringUtils.toUnderScoreCase(tablepar.getOrderByColumn()) +" "+tablepar.getIsAsc());
+ }
+ PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+ List list= taskfileInfoMapper.selectByExample(testExample);
+ PageInfo pageInfo = new PageInfo(list);
+ return pageInfo;
+ }
+
+ /**
+ * 分页列表查询.
+ * @param tablepar
+ * @param taskid
+ * @return
+ */
+ public PageInfo getPageListByTaskid(Tablepar tablepar, String taskid){
+ final List