jz.kai 4 роки тому
батько
коміт
5004f08434

+ 2 - 0
common/src/main/java/com/jpsoft/enterprise/modules/base/entity/CooperationInfo.java

@@ -22,6 +22,8 @@ public class CooperationInfo {
 
     @ApiModelProperty(value = "类型")
     private String type;
+    @ApiModelProperty(value = "类型名称")
+    private String typeN;
 
     @ApiModelProperty(value = "图片地址")
     private String picUrl;

+ 2 - 2
common/src/main/resources/mapper/base/CooperationInfo.xml

@@ -101,8 +101,8 @@
 		]]>
         <where>
             del_flag = 0
-            <if test="searchParams.id != null">
-                and ID_ like #{searchParams.id}
+            <if test="searchParams.title != null">
+                and title_ like #{searchParams.title}
             </if>
             <if test="searchParams.type != null">
                 and type_ = #{searchParams.type}

+ 247 - 0
web/src/main/java/com/jpsoft/enterprise/modules/base/controller/CooperationInfoController.java

@@ -0,0 +1,247 @@
+package com.jpsoft.enterprise.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.enterprise.modules.common.utils.PojoUtils;
+import com.jpsoft.enterprise.modules.common.dto.Sort;
+import com.jpsoft.enterprise.modules.common.dto.MessageResult;
+import com.jpsoft.enterprise.modules.base.entity.CooperationInfo;
+import com.jpsoft.enterprise.modules.base.service.CooperationInfoService;
+import com.jpsoft.enterprise.modules.sys.entity.User;
+import com.jpsoft.enterprise.modules.sys.service.DataDictionaryService;
+import com.jpsoft.enterprise.modules.sys.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/cooperationInfo")
+@Api(description = "cooperationInfo")
+public class CooperationInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CooperationInfoService cooperationInfoService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<CooperationInfo> create(){
+        MessageResult<CooperationInfo> msgResult = new MessageResult<>();
+
+        CooperationInfo cooperationInfo = new CooperationInfo();
+
+        msgResult.setData(cooperationInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<CooperationInfo> add(@RequestBody CooperationInfo cooperationInfo,@RequestAttribute String subject){
+        MessageResult<CooperationInfo> msgResult = new MessageResult<>();
+        User user = userService.get(subject);
+
+        try {
+            cooperationInfo.setId(UUID.randomUUID().toString());
+            cooperationInfo.setCompanyId(user.getCompanyId());
+            cooperationInfo.setDelFlag(false);
+            cooperationInfo.setCreateBy(subject);
+            cooperationInfo.setCreateTime(new Date());
+            
+            int affectCount = cooperationInfoService.insert(cooperationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(cooperationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<CooperationInfo> edit(@PathVariable("id") String id){
+        MessageResult<CooperationInfo> msgResult = new MessageResult<>();
+
+        try {
+            CooperationInfo cooperationInfo = cooperationInfoService.get(id);
+
+            if (cooperationInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(cooperationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<CooperationInfo> update(@RequestBody CooperationInfo cooperationInfo,@RequestAttribute String subject){
+        MessageResult<CooperationInfo> msgResult = new MessageResult<>();
+
+        try {
+            cooperationInfo.setUpdateBy(subject);
+            cooperationInfo.setUpdateTime(new Date());
+            
+            int affectCount = cooperationInfoService.update(cooperationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(cooperationInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            CooperationInfo cooperationInfo = cooperationInfoService.get(id);
+            cooperationInfo.setDelFlag(true);
+            cooperationInfo.setUpdateBy(subject);
+            cooperationInfo.setUpdateTime(new Date());
+
+            int affectCount = cooperationInfoService.update(cooperationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                CooperationInfo cooperationInfo = cooperationInfoService.get(id);
+                cooperationInfo.setDelFlag(true);
+                cooperationInfo.setUpdateBy(subject);
+                cooperationInfo.setUpdateTime(new Date());
+
+                affectCount += cooperationInfoService.update(cooperationInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String title, String type, String status,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+        User user = userService.get(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("companyId",user.getCompanyId());
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","asc"));
+
+        if (StringUtils.isNotEmpty(type)) {
+            searchParams.put("type",type);
+        }
+        if (StringUtils.isNotEmpty(status)) {
+            if(status.equals("false"))
+                searchParams.put("status",false);
+            if(status.equals("true"))
+                searchParams.put("status",true);
+        }
+        if (StringUtils.isNotEmpty(title)) {
+            searchParams.put("title","%" + title + "%");
+        }
+
+        Page<CooperationInfo> page = cooperationInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(CooperationInfo cooperationInfo : page.getResult()){
+            cooperationInfo.setTypeN(dataDictionaryService.findNameByCatalogNameAndValue("互助类型",cooperationInfo.getType()));
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}