LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
梁琦涛
2021-09-07 14:24:39 +08:00
parent 4c33106cdf b8af9726df
commit 442e79bf4f
7 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+50 -18
View File
@@ -31,6 +31,7 @@ import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.modules.message.handle.impl.EmailSendMsgHandle;
import com.jero.modules.oss.service.IOSSFileService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.SecurityUtils;
@@ -66,6 +67,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@Resource
private IPayMeetingSituationService payMeetingSituationService;
//拼接目录结构
StringBuffer stringBuffer;
@@ -80,7 +82,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@AutoLog(value = "资料维护（资料列表）-根据文件夹id分页列表查询")
@ApiOperation(value="资料维护（资料列表）-根据文件夹id分页列表查询", notes="资料维护（资料列表）-根据文件夹id分页列表查询")
@GetMapping(value = "/list")
@ApiImplicitParam(name = "id", value = "目录id", dataType = "String", required = true)
@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
public Result<?> queryPageList(
@RequestParam(name="id") String id,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -105,7 +107,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@AutoLog(value = "资料维护（会议列表）-根据文件夹id分页列表查询")
@ApiOperation(value="资料维护（会议列表）-根据文件夹id分页列表查询", notes="资料维护（会议列表）-根据文件夹id分页列表查询")
@GetMapping(value = "/listMeeting")
@ApiImplicitParam(name = "id", value = "目录id", dataType = "String", required = true)
@ApiImplicitParam(name = "id", value = "目录id，查询该目录下文件", dataType = "String", required = true)
public Result<?> queryPageListMeeting(
@RequestParam(name="id") String id,
QueryFileListBySearch queryFileListBySearch,
@@ -134,6 +136,11 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
*/
@AutoLog(value = "资料维护(资料和会议)-添加")
@ApiOperation(value="资料维护(资料和会议)-添加", notes="资料维护(资料和会议)-添加")
@ApiImplicitParams({
@ApiImplicitParam(name = "dataId", value = "目录id"),
@ApiImplicitParam(name = "fileIds", value = "资料id,多个以逗号隔开"),
@ApiImplicitParam(name = "dataType", value = "文件类型，资料1或者会议2")
})
@PostMapping(value = "/add")
@Transactional
public Result<?> add(@RequestParam(name="dataId") String dataId,
@@ -169,6 +176,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
stringBuffer.append(one.getName()).append("/");
}
}
/**
* 编辑
*
@@ -177,29 +185,33 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@ApiOperation(value="资料维护(资料和会议)-编辑", notes="资料维护(资料和会议)-编辑")
@PostMapping(value = "/edit")
@Transactional
@ApiImplicitParam(name = "dataId", value = "目录id", dataType = "String", required = true)
public Result<?> edit(@RequestParam(name="dataId") String dataId,
@RequestParam(name="oldFileId") String oldFileId,
@RequestParam(name="newFileId") String newFileId,
@RequestParam(name="dataType") int dataType) {
@ApiImplicitParams({
@ApiImplicitParam(name = "id",value = "主键id"),
@ApiImplicitParam(name = "fileId", value = "资料id"),
@ApiImplicitParam(name = "oldFileId", value = "原来资料id")
})
public Result<?> edit(@RequestParam(name="id") String id,
@RequestParam(name="fileId") String fileId,
@RequestParam(name="oldFileId") String oldFileId) {
iossFileService.removeById(oldFileId);
stringBuffer = new StringBuffer();
findToTree(dataId,dataType);
stringBuffer.deleteCharAt(stringBuffer.lastIndexOf("/"));
PayDataFile payDataFile = new PayDataFile();
payDataFile.setFilePath(stringBuffer.toString());
payDataFile.setFileId(newFileId);
payDataFile.setDataId(dataId);
payDataFileService.save(payDataFile);
payDataFile.setFileId(fileId);
payDataFile.setId(id);
payDataFileService.updateById(payDataFile);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
*/
@AutoLog(value = "资料维护(资料和会议)-通过id删除")
@ApiOperation(value="资料维护(资料和会议)-通过id删除", notes="资料维护(资料和会议)-通过id删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids",value = "主键id"),
@ApiImplicitParam(name = "dataIds", value = "资料id")
})
@GetMapping(value = "/delete")
@Transactional
@ApiImplicitParam(name = "id", value = "目录主键", dataType = "String", required = true)
@@ -222,6 +234,10 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
@AutoLog(value = "资料维护(资料和会议)-批量删除")
@ApiOperation(value="资料维护(资料和会议)-批量删除", notes="资料维护(资料和会议)-批量删除")
@GetMapping(value = "/deleteBatch")
@ApiImplicitParams({
@ApiImplicitParam(name = "ids",value = "主键id,多个以逗号隔开"),
@ApiImplicitParam(name = "dataIds", value = "资料id，多个以逗号隔开")
})
public Result<?> deleteBatch(@RequestParam(name="ids") String ids,@RequestParam(name="dataIds") String dataIds) {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
payDataFileService.removeByIds(strings);
@@ -252,6 +268,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
List<PayMeetingSituation> list = payMeetingSituationService.list(lambdaQueryWrapper);
return Result.OK(list);
}
/**
* @description: 根据公司id和会议id查询参会人员列表
* @author: zhangqinlin
@@ -259,7 +276,11 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
* @version: V1.0
*/
@AutoLog(value = "根据公司id和会议id查询参会人员列表")
@ApiOperation(value="根据会议id和会议id查询参会人员列表", notes="根据会议id和会议id查询参会人员列表")
@ApiOperation(value="根据公司id和会议id查询参会人员列表", notes="根据公司id和会议id查询参会人员列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "meetingId",value = "会议id"),
@ApiImplicitParam(name = "companyId", value = "公司id")
})
@GetMapping(value = "/queryListByCompanyId")
public Result<List<queryPeopleByCompanyIdAndMeetingId>> queryPeopleByCompanyIdAndMeetingId(
@RequestParam(name="meetingId") String meetingId,
@@ -291,6 +312,10 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
*/
@AutoLog(value = "分发")
@ApiOperation(value="分发", notes="分发")
@ApiImplicitParams({
@ApiImplicitParam(name = "FileName",value = "文件名"),
@ApiImplicitParam(name = "mails", value = "邮箱地址，多个以逗号隔开")
})
@GetMapping(value = "/distribute")
public Result<?> distribute(
@RequestParam(name="FileName") String FileName,
@@ -310,6 +335,10 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
*/
@AutoLog(value = "批量分发")
@ApiOperation(value="批量分发", notes="批量分发")
@ApiImplicitParams({
@ApiImplicitParam(name = "FileNameS",value = "文件名，多个以逗号隔开"),
@ApiImplicitParam(name = "mails", value = "邮箱地址，多个以逗号隔开")
})
@GetMapping(value = "/distributes")
public Result<?> distributes(
@RequestParam(name="FileNameS") String FileNameS,
@@ -342,6 +371,11 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
*/
@AutoLog(value = "会议上传文件")
@ApiOperation(value="会议上传文件", notes="会议上传文件")
@ApiImplicitParams({
@ApiImplicitParam(name = "dataId",value = "目录id"),
@ApiImplicitParam(name = "fileIds",value = "文件id，多个以逗号隔开"),
@ApiImplicitParam(name = "dataType", value = "文件类型，资料1或者会议2")
})
@PostMapping(value = "/addMeetingFile")
@Transactional
public Result<?> addMeetingFile(@RequestParam(name="dataId") String dataId,
@@ -410,9 +444,7 @@ public class PayDataFileController extends JeroController<PayDataFile, IPayDataF
zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
zipos.setMethod(ZipOutputStream.DEFLATED); //设置压缩方法
for (String path : paths){
StringBuffer url = new StringBuffer("D:\\opt\\upFiles");
url.append("\\" + path+".pdf");
File file = new File(url.toString());
File file = new File("D:\\opt\\upFiles" + "\\" + path + ".pdf");
if(file.exists()){
try {
//添加ZipEntry，并ZipEntry中写入文件流
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/VO/payCaseCommitteeSubitemVO.java
+3
View File
@@ -12,6 +12,9 @@ public class payCaseCommitteeSubitemVO {
@ApiModelProperty(value = "分标委成员主键")
private java.lang.String id;
@ApiModelProperty(value = "联系人id")
private java.lang.String contactId;
@ApiModelProperty(value = "企业名称")
private java.lang.String companyName;
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/queryPeopleByCompanyIdAndMeetingId.java
+4 -1
View File
@@ -8,7 +8,10 @@ public class queryPeopleByCompanyIdAndMeetingId {
@ApiModelProperty(value = "id")
private String id;
@ApiModelProperty(value = "姓名")
@ApiModelProperty(value = "联系人id")
private String contactId;
@ApiModelProperty(value = "联系人姓名")
private String userName;
@ApiModelProperty(value = "邮箱")
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<select id="list2" resultType="com.jero.data.entity.VO.payCaseCommitteeSubitemVO">
SELECT pm.id as id,pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phoneNamber,pt.email
SELECT pm.id as id,pt.id as contactId, pt.name as contactsName,pm.company_name as companyName,pt.post as post,pt.phone as phoneNamber,pt.email
from
pay_case_committee pe
left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayDataFileMapper.xml
+1
View File
@@ -34,6 +34,7 @@
<select id="queryPeopleByCompanyIdAndMeetingId" resultType="com.jero.data.entity.queryPeopleByCompanyIdAndMeetingId">
SELECT
ps.user_id as id,
pm.id as contactId,
ps.user_name as userName,
pm.email as email
FROM pay_meeting_situation as ps left join pay_contacts_management as pm on(ps.user_id=pm.id)
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+10 -10
View File
@@ -20,12 +20,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* @Description: pay_mail_bill
* @Description: 邮寄票据
* @Author: jeecg-boot
* @Date: 2021-09-02
* @Version: V1.0
*/
@Api(tags="pay_mail_bill")
@Api(tags="邮寄票据")
@RestController
@RequestMapping("/mail/payMailBill")
@Slf4j
@@ -42,14 +42,14 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* @param req
* @return
*/
@ApiOperation(value="pay_mail_bill-分页列表查询", notes="pay_mail_bill-分页列表查询")
@ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayMailBill payMailBill,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMailBill> queryWrapper = QueryGenerator.initQueryWrapper(payMailBill, req.getParameterMap());
Page<PayMailBill> page = new Page<PayMailBill>(pageNo, pageSize);
Page<PayMailBill> page = new Page<>(pageNo, pageSize);
IPage<PayMailBill> pageList = payMailBillService.page(page, queryWrapper);
return Result.OK(pageList);
}
@@ -60,7 +60,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* @param payMailBill
* @return
*/
@ApiOperation(value="pay_mail_bill-添加", notes="pay_mail_bill-添加")
@ApiOperation(value="邮寄票据-添加", notes="邮寄票据-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMailBill payMailBill) {
payMailBillService.save(payMailBill);
@@ -73,7 +73,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* @param payMailBill
* @return
*/
@ApiOperation(value="pay_mail_bill-编辑", notes="pay_mail_bill-编辑")
@ApiOperation(value="邮寄票据-编辑", notes="邮寄票据-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailBill payMailBill) {
payMailBillService.updateById(payMailBill);
@@ -86,7 +86,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* @param id
* @return
*/
@ApiOperation(value="pay_mail_bill-通过id删除", notes="pay_mail_bill-通过id删除")
@ApiOperation(value="邮寄票据-通过id删除", notes="邮寄票据-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
payMailBillService.removeById(id);
@@ -99,7 +99,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* @param ids
* @return
*/
@ApiOperation(value="pay_mail_bill-批量删除", notes="pay_mail_bill-批量删除")
@ApiOperation(value="邮寄票据-批量删除", notes="邮寄票据-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.payMailBillService.removeByIds(Arrays.asList(ids.split(",")));
@@ -112,7 +112,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* @param id
* @return
*/
@ApiOperation(value="pay_mail_bill-通过id查询", notes="pay_mail_bill-通过id查询")
@ApiOperation(value="邮寄票据-通过id查询", notes="邮寄票据-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
PayMailBill payMailBill = payMailBillService.getById(id);
@@ -130,7 +130,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMailBill payMailBill) {
return super.exportXls(request, payMailBill, PayMailBill.class, "pay_mail_bill");
return super.exportXls(request, payMailBill, PayMailBill.class, "邮寄票据");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java
+4
View File
@@ -95,4 +95,8 @@ public class PayMailBill implements Serializable {
@Excel(name = "项目名称", width = 15)
@ApiModelProperty(value = "项目名称")
private java.lang.String projectName;
/**来款单位*/
@Excel(name = "来款单位", width = 15)
@ApiModelProperty(value = "来款单位")
private java.lang.String chargeCompanyName;
}