From 4c33106cdf70df8f2495e634b453b8bb2f4524c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 14:24:23 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 69ba6f66..37b9349e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -66,7 +66,7 @@ WHERE pwg.id is not null AND pwg.id !='' AND pwgs.charge_company_id = #{companyId} AND pwgs.id NOT IN (SELECT project_id FROM pay_income_contract_associated WHERE project_type=#{projectType}) - AND pwg.working_group_project = #{workingGroupProject} + AND pwg.working_group_project LIKE concat('%',concat(#{workingGroupProject},'%')) AND pwg.year = #{year} From ad5bac1b39416a3cc542865d81ffec64eabad5d7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 7 Sep 2021 14:26:05 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix=20=E6=97=A0=E6=B3=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=85=92=E5=BA=97=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 61d2d0b0..95362fb0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -56,7 +56,7 @@ public class PayMeetingServiceImpl extends ServiceImpl hotelContactsList = new ArrayList<>(); + List hotelContactsList = payMeetingVO.getHotelContactsList(); PayMeeting payMeeting = getPayMeeting(payMeetingVO,hotelContactsList); save(payMeeting); //如果酒店联系人列表不为空，就新增 @@ -146,7 +146,6 @@ public class PayMeetingServiceImpl extends ServiceImpl Date: Tue, 7 Sep 2021 14:34:49 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 7e369b1f..96fc3a60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -406,25 +406,18 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroup.getId()); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payIncomeContract.getSignedCompanyId()); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); - if(CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ + PayWorkingGroupSubItem listPayWorkingGroupSubItem = payWorkingGroupSubItemService.getById(payIncomeContractAssociated.getProjectId()); + if(Objects.isNull(listPayWorkingGroupSubItem)){ throw new JeroBootException("工作组成员单位不存在！"); } // 更新项目id - payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.get(0).getId()); + payIncomeContractAssociated.setProjectId(listPayWorkingGroupSubItem.getId()); // todo 不是打包企业 取消打包 将关联项目取消打包 LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername()); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date()); updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getPack,PayIncomeContractCommon.PACK0); - updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.get(0).getId()); + updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId,listPayWorkingGroupSubItem.getId()); payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); break; case PayIncomeContractCommon.PROJECT_TYPE3: From 1ca41ca4532a0d2c1ed2b41deaea519339313ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 15:04:30 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PaySpendingContractController.java | 156 +++++++++++++++++ ...SpendingContractInstallmentController.java | 155 +++++++++++++++++ .../contract/entity/PaySpendingContract.java | 159 ++++++++++++++++++ .../PaySpendingContractInstallment.java | 79 +++++++++ .../PaySpendingContractInstallmentMapper.java | 15 ++ .../mapper/PaySpendingContractMapper.java | 15 ++ .../PaySpendingContractInstallmentMapper.xml | 5 + .../mapper/xml/PaySpendingContractMapper.xml | 5 + ...PaySpendingContractInstallmentService.java | 15 ++ .../service/IPaySpendingContractService.java | 14 ++ ...pendingContractInstallmentServiceImpl.java | 18 ++ .../impl/PaySpendingContractServiceImpl.java | 18 ++ .../controller/PayPackCompanyController.java | 155 +++++++++++++++++ .../PayPackCompanyProjectController.java | 155 +++++++++++++++++ .../com/jero/pack/entity/PayPackCompany.java | 116 +++++++++++++ .../pack/entity/PayPackCompanyProject.java | 62 +++++++ .../pack/mapper/PayPackCompanyMapper.java | 15 ++ .../mapper/PayPackCompanyProjectMapper.java | 15 ++ .../pack/mapper/xml/PayPackCompanyMapper.xml | 5 + .../xml/PayPackCompanyProjectMapper.xml | 5 + .../IPayPackCompanyProjectService.java | 15 ++ .../pack/service/IPayPackCompanyService.java | 14 ++ .../PayPackCompanyProjectServiceImpl.java | 18 ++ .../impl/PayPackCompanyServiceImpl.java | 18 ++ .../PayCommonProjectController.java | 15 +- .../controller/PayWorkingGroupController.java | 2 +- 26 files changed, 1256 insertions(+), 8 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java new file mode 100644 index 00000000..98b12411 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -0,0 +1,156 @@ +package com.jero.contract.controller; + +import java.util.Arrays; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.contract.entity.PaySpendingContract; +import com.jero.contract.service.IPaySpendingContractService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_spending_contract") +@RestController +@RequestMapping("/contract/paySpendingContract") +@Slf4j +public class PaySpendingContractController extends JeroController { + @Autowired + private IPaySpendingContractService paySpendingContractService; + + /** + * 分页列表查询 + * + * @param paySpendingContract + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_spending_contract-分页列表查询") + @ApiOperation(value="pay_spending_contract-分页列表查询", notes="pay_spending_contract-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PaySpendingContract paySpendingContract, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContract, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = paySpendingContractService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param paySpendingContract + * @return + */ + @AutoLog(value = "pay_spending_contract-添加") + @ApiOperation(value="pay_spending_contract-添加", notes="pay_spending_contract-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PaySpendingContract paySpendingContract) { + paySpendingContractService.save(paySpendingContract); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paySpendingContract + * @return + */ + @AutoLog(value = "pay_spending_contract-编辑") + @ApiOperation(value="pay_spending_contract-编辑", notes="pay_spending_contract-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PaySpendingContract paySpendingContract) { + paySpendingContractService.updateById(paySpendingContract); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract-通过id删除") + @ApiOperation(value="pay_spending_contract-通过id删除", notes="pay_spending_contract-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + paySpendingContractService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_spending_contract-批量删除") + @ApiOperation(value="pay_spending_contract-批量删除", notes="pay_spending_contract-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.paySpendingContractService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract-通过id查询") + @ApiOperation(value="pay_spending_contract-通过id查询", notes="pay_spending_contract-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PaySpendingContract paySpendingContract = paySpendingContractService.getById(id); + if(paySpendingContract==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paySpendingContract); + } + + /** + * 导出excel + * + * @param request + * @param paySpendingContract + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PaySpendingContract paySpendingContract) { + return super.exportXls(request, paySpendingContract, PaySpendingContract.class, "pay_spending_contract"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PaySpendingContract.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java new file mode 100644 index 00000000..612ec817 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java @@ -0,0 +1,155 @@ +package com.jero.contract.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.contract.entity.PaySpendingContractInstallment; +import com.jero.contract.service.IPaySpendingContractInstallmentService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_spending_contract_installment") +@RestController +@RequestMapping("/contract/paySpendingContractInstallment") +@Slf4j +public class PaySpendingContractInstallmentController extends JeroController { + @Autowired + private IPaySpendingContractInstallmentService paySpendingContractInstallmentService; + + /** + * 分页列表查询 + * + * @param paySpendingContractInstallment + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-分页列表查询") + @ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PaySpendingContractInstallment paySpendingContractInstallment, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContractInstallment, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = paySpendingContractInstallmentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param paySpendingContractInstallment + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-添加") + @ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { + paySpendingContractInstallmentService.save(paySpendingContractInstallment); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param paySpendingContractInstallment + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-编辑") + @ApiOperation(value="pay_spending_contract_installment-编辑", notes="pay_spending_contract_installment-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { + paySpendingContractInstallmentService.updateById(paySpendingContractInstallment); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-通过id删除") + @ApiOperation(value="pay_spending_contract_installment-通过id删除", notes="pay_spending_contract_installment-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + paySpendingContractInstallmentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-批量删除") + @ApiOperation(value="pay_spending_contract_installment-批量删除", notes="pay_spending_contract_installment-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_spending_contract_installment-通过id查询") + @ApiOperation(value="pay_spending_contract_installment-通过id查询", notes="pay_spending_contract_installment-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id); + if(paySpendingContractInstallment==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paySpendingContractInstallment); + } + + /** + * 导出excel + * + * @param request + * @param paySpendingContractInstallment + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PaySpendingContractInstallment paySpendingContractInstallment) { + return super.exportXls(request, paySpendingContractInstallment, PaySpendingContractInstallment.class, "pay_spending_contract_installment"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PaySpendingContractInstallment.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java new file mode 100644 index 00000000..288880a5 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -0,0 +1,159 @@ +package com.jero.contract.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_spending_contract") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_spending_contract对象", description="pay_spending_contract") +public class PaySpendingContract implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**合同编号*/ + @Excel(name = "合同编号", width = 15) + @ApiModelProperty(value = "合同编号") + private String contractNum; + /**合同名称*/ + @Excel(name = "合同名称", width = 15) + @ApiModelProperty(value = "合同名称") + private String contractName; + /**签订单位id*/ + @Excel(name = "签订单位id", width = 15) + @ApiModelProperty(value = "签订单位id") + private String signedCompanyId; + /**临时签订单位id*/ + @Excel(name = "临时签订单位id", width = 15) + @ApiModelProperty(value = "临时签订单位id") + private String signedCompanyTemporaryId; + /**临时签订单位名称*/ + @Excel(name = "临时签订单位名称", width = 15) + @ApiModelProperty(value = "临时签订单位名称") + private String signedCompanyTemporaryName; + /**签订单位联系人id*/ + @Excel(name = "签订单位联系人id", width = 15) + @ApiModelProperty(value = "签订单位联系人id") + private String signedContactsId; + /**临时签订单位联系人id*/ + @Excel(name = "临时签订单位联系人id", width = 15) + @ApiModelProperty(value = "临时签订单位联系人id") + private String signedContactsTemporaryId; + /**临时签订单位联系人名称*/ + @Excel(name = "临时签订单位联系人名称", width = 15) + @ApiModelProperty(value = "临时签订单位联系人名称") + private String signedContactsTemporaryName; + /**是否开口（1：是，0：否）*/ + @Excel(name = "是否开口（1：是，0：否）", width = 15) + @ApiModelProperty(value = "是否开口（1：是，0：否）") + private Integer opening; + /**负责人id*/ + @Excel(name = "负责人id", width = 15) + @ApiModelProperty(value = "负责人id") + private String principalId; + /**负责人名称*/ + @Excel(name = "负责人名称", width = 15) + @ApiModelProperty(value = "负责人名称") + private String principalName; + /**部门名称*/ + @Excel(name = "部门名称", width = 15) + @ApiModelProperty(value = "部门名称") + private String departmentName; + /**签订合同金额*/ + @Excel(name = "签订合同金额", width = 15) + @ApiModelProperty(value = "签订合同金额") + private String contractAmount; + /**税率*/ + @Excel(name = "税率", width = 15) + @ApiModelProperty(value = "税率") + private String rate; + /**未税金额*/ + @Excel(name = "未税金额", width = 15) + @ApiModelProperty(value = "未税金额") + private String noTaxAmount; + /**合同签订日期*/ + @Excel(name = "合同签订日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "合同签订日期") + private Date contractDate; + /**合同终止日期*/ + @Excel(name = "合同终止日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "合同终止日期") + private Date terminationDate; + /**合同约定主要时点*/ + @Excel(name = "合同约定主要时点", width = 15) + @ApiModelProperty(value = "合同约定主要时点") + private String contractTimePoints; + /**应收金额*/ + @Excel(name = "应收金额", width = 15) + @ApiModelProperty(value = "应收金额") + private String accountsReceivableAmount; + /**已收金额*/ + @Excel(name = "已收金额", width = 15) + @ApiModelProperty(value = "已收金额") + private String amountReceived; + /**未收金额*/ + @Excel(name = "未收金额", width = 15) + @ApiModelProperty(value = "未收金额") + private String outstandingAmount; + /**账款状态（1：未支付，2：部分支付，3：已付全款）*/ + @Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15) + @ApiModelProperty(value = "账款状态（1：未支付，2：部分支付，3：已付全款）") + private Integer accountStatus; + /**合同约定付款次数*/ + @Excel(name = "合同约定付款次数", width = 15) + @ApiModelProperty(value = "合同约定付款次数") + private String contractPaymentTimes; + /**是否打包（1：是，0：否）*/ + @Excel(name = "是否打包（1：是，0：否）", width = 15) + @ApiModelProperty(value = "是否打包（1：是，0：否）") + private Integer pack; + /**打包年份*/ + @Excel(name = "打包年份", width = 15) + @ApiModelProperty(value = "打包年份") + private String packYear; + /**合同状态（1：草稿，2：已通过，3：未通过，4：已归档）*/ + @Excel(name = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）", width = 15) + @ApiModelProperty(value = "合同状态（1：草稿，2：已通过，3：未通过，4：已归档）") + private Integer contractStatus; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java new file mode 100644 index 00000000..526c4ac3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -0,0 +1,79 @@ +package com.jero.contract.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_spending_contract_installment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_spending_contract_installment对象", description="pay_spending_contract_installment") +public class PaySpendingContractInstallment implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**合同id*/ + @Excel(name = "合同id", width = 15) + @ApiModelProperty(value = "合同id") + private String contractId; + /**阶段名称*/ + @Excel(name = "阶段名称", width = 15) + @ApiModelProperty(value = "阶段名称") + private String phaseName; + /**应收金额*/ + @Excel(name = "应收金额", width = 15) + @ApiModelProperty(value = "应收金额") + private Integer accountsReceivableAmount; + /**应收时间*/ + @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "应收时间") + private Date accountsReceivableTime; + /**实收金额*/ + @Excel(name = "实收金额", width = 15) + @ApiModelProperty(value = "实收金额") + private Integer paidAmount; + /**实收时间*/ + @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "实收时间") + private Date paidTime; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java new file mode 100644 index 00000000..1813b7c0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractInstallmentMapper.java @@ -0,0 +1,15 @@ +package com.jero.contract.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.contract.entity.PaySpendingContractInstallment; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PaySpendingContractInstallmentMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java new file mode 100644 index 00000000..6d5a7453 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java @@ -0,0 +1,15 @@ +package com.jero.contract.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.contract.entity.PaySpendingContract; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PaySpendingContractMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml new file mode 100644 index 00000000..0122a7ed --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractInstallmentMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml new file mode 100644 index 00000000..4f33b071 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java new file mode 100644 index 00000000..09667fde --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractInstallmentService.java @@ -0,0 +1,15 @@ +package com.jero.contract.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.contract.entity.PaySpendingContractInstallment; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPaySpendingContractInstallmentService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java new file mode 100644 index 00000000..c75af376 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -0,0 +1,14 @@ +package com.jero.contract.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.contract.entity.PaySpendingContract; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPaySpendingContractService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java new file mode 100644 index 00000000..7391a8ec --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractInstallmentServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.contract.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.contract.entity.PaySpendingContractInstallment; +import com.jero.contract.mapper.PaySpendingContractInstallmentMapper; +import com.jero.contract.service.IPaySpendingContractInstallmentService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_spending_contract_installment + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PaySpendingContractInstallmentServiceImpl extends ServiceImpl implements IPaySpendingContractInstallmentService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java new file mode 100644 index 00000000..67995987 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.contract.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.contract.entity.PaySpendingContract; +import com.jero.contract.mapper.PaySpendingContractMapper; +import com.jero.contract.service.IPaySpendingContractService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_spending_contract + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PaySpendingContractServiceImpl extends ServiceImpl implements IPaySpendingContractService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java new file mode 100644 index 00000000..67d147ca --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -0,0 +1,155 @@ +package com.jero.pack.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.service.IPayPackCompanyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_pack_company") +@RestController +@RequestMapping("/pack/payPackCompany") +@Slf4j +public class PayPackCompanyController extends JeroController { + @Autowired + private IPayPackCompanyService payPackCompanyService; + + /** + * 分页列表查询 + * + * @param payPackCompany + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_pack_company-分页列表查询") + @ApiOperation(value="pay_pack_company-分页列表查询", notes="pay_pack_company-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayPackCompany payPackCompany, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payPackCompany, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payPackCompanyService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payPackCompany + * @return + */ + @AutoLog(value = "pay_pack_company-添加") + @ApiOperation(value="pay_pack_company-添加", notes="pay_pack_company-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayPackCompany payPackCompany) { + payPackCompanyService.save(payPackCompany); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payPackCompany + * @return + */ + @AutoLog(value = "pay_pack_company-编辑") + @ApiOperation(value="pay_pack_company-编辑", notes="pay_pack_company-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayPackCompany payPackCompany) { + payPackCompanyService.updateById(payPackCompany); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company-通过id删除") + @ApiOperation(value="pay_pack_company-通过id删除", notes="pay_pack_company-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payPackCompanyService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_pack_company-批量删除") + @ApiOperation(value="pay_pack_company-批量删除", notes="pay_pack_company-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payPackCompanyService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company-通过id查询") + @ApiOperation(value="pay_pack_company-通过id查询", notes="pay_pack_company-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayPackCompany payPackCompany = payPackCompanyService.getById(id); + if(payPackCompany==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payPackCompany); + } + + /** + * 导出excel + * + * @param request + * @param payPackCompany + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayPackCompany payPackCompany) { + return super.exportXls(request, payPackCompany, PayPackCompany.class, "pay_pack_company"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayPackCompany.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java new file mode 100644 index 00000000..8d4d9b9a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java @@ -0,0 +1,155 @@ +package com.jero.pack.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.pack.entity.PayPackCompanyProject; +import com.jero.pack.service.IPayPackCompanyProjectService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Api(tags="pay_pack_company_project") +@RestController +@RequestMapping("/pack/payPackCompanyProject") +@Slf4j +public class PayPackCompanyProjectController extends JeroController { + @Autowired + private IPayPackCompanyProjectService payPackCompanyProjectService; + + /** + * 分页列表查询 + * + * @param payPackCompanyProject + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "pay_pack_company_project-分页列表查询") + @ApiOperation(value="pay_pack_company_project-分页列表查询", notes="pay_pack_company_project-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayPackCompanyProject payPackCompanyProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payPackCompanyProject, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = payPackCompanyProjectService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payPackCompanyProject + * @return + */ + @AutoLog(value = "pay_pack_company_project-添加") + @ApiOperation(value="pay_pack_company_project-添加", notes="pay_pack_company_project-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayPackCompanyProject payPackCompanyProject) { + payPackCompanyProjectService.save(payPackCompanyProject); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param payPackCompanyProject + * @return + */ + @AutoLog(value = "pay_pack_company_project-编辑") + @ApiOperation(value="pay_pack_company_project-编辑", notes="pay_pack_company_project-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody PayPackCompanyProject payPackCompanyProject) { + payPackCompanyProjectService.updateById(payPackCompanyProject); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company_project-通过id删除") + @ApiOperation(value="pay_pack_company_project-通过id删除", notes="pay_pack_company_project-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payPackCompanyProjectService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "pay_pack_company_project-批量删除") + @ApiOperation(value="pay_pack_company_project-批量删除", notes="pay_pack_company_project-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payPackCompanyProjectService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "pay_pack_company_project-通过id查询") + @ApiOperation(value="pay_pack_company_project-通过id查询", notes="pay_pack_company_project-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayPackCompanyProject payPackCompanyProject = payPackCompanyProjectService.getById(id); + if(payPackCompanyProject==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payPackCompanyProject); + } + + /** + * 导出excel + * + * @param request + * @param payPackCompanyProject + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayPackCompanyProject payPackCompanyProject) { + return super.exportXls(request, payPackCompanyProject, PayPackCompanyProject.class, "pay_pack_company_project"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, PayPackCompanyProject.class); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java new file mode 100644 index 00000000..9022eac7 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompany.java @@ -0,0 +1,116 @@ +package com.jero.pack.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_pack_company") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_pack_company对象", description="pay_pack_company") +public class PayPackCompany implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyId; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyTemporaryId; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyTemporaryName; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private java.lang.String companyContactId; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private java.lang.String companyContactTemporaryId; + /**企业联系人*/ + @Excel(name = "企业联系人", width = 15) + @ApiModelProperty(value = "企业联系人") + private java.lang.String companyContactTemporaryName; + /**打包年份*/ + @Excel(name = "打包年份", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "打包年份") + private java.util.Date packYear; + /**打包联系人id*/ + @Excel(name = "打包联系人id", width = 15) + @ApiModelProperty(value = "打包联系人id") + private java.lang.String packContactId; + /**打包联系人id*/ + @Excel(name = "打包联系人id", width = 15) + @ApiModelProperty(value = "打包联系人id") + private java.lang.String packContactTemporaryId; + /**打包联系人*/ + @Excel(name = "打包联系人", width = 15) + @ApiModelProperty(value = "打包联系人") + private java.lang.String packContactTemporaryName; + /**打包费用总计*/ + @Excel(name = "打包费用总计", width = 15) + @ApiModelProperty(value = "打包费用总计") + private java.lang.Integer packChargeTotal; + /**打包费用备注*/ + @Excel(name = "打包费用备注", width = 15) + @ApiModelProperty(value = "打包费用备注") + private java.lang.String packChargeRemark; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + /**实际到账费用*/ + @Excel(name = "实际到账费用", width = 15) + @ApiModelProperty(value = "实际到账费用") + private java.lang.Integer receiptExpense; + /**开票金额*/ + @Excel(name = "开票金额", width = 15) + @ApiModelProperty(value = "开票金额") + private java.lang.Integer invoiceAmount; + /**未开票金额*/ + @Excel(name = "未开票金额", width = 15) + @ApiModelProperty(value = "未开票金额") + private java.lang.Integer uninvoicedAmount; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java new file mode 100644 index 00000000..054bf6d3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/entity/PayPackCompanyProject.java @@ -0,0 +1,62 @@ +package com.jero.pack.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Data +@TableName("pay_pack_company_project") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_pack_company_project对象", description="pay_pack_company_project") +public class PayPackCompanyProject implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyId; + /**来源（1:收入合同,2:打包管理）*/ + @Excel(name = "来源（1:收入合同,2:打包管理）", width = 15) + @ApiModelProperty(value = "来源（1:收入合同,2:打包管理）") + private java.lang.Integer come; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java new file mode 100644 index 00000000..e73efa37 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java @@ -0,0 +1,15 @@ +package com.jero.pack.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.pack.entity.PayPackCompany; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PayPackCompanyMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java new file mode 100644 index 00000000..6085dcd8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyProjectMapper.java @@ -0,0 +1,15 @@ +package com.jero.pack.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.pack.entity.PayPackCompanyProject; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface PayPackCompanyProjectMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml new file mode 100644 index 00000000..80b5849c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml new file mode 100644 index 00000000..e7f2b1bb --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java new file mode 100644 index 00000000..5405e5a0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java @@ -0,0 +1,15 @@ +package com.jero.pack.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.pack.entity.PayPackCompanyProject; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPayPackCompanyProjectService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java new file mode 100644 index 00000000..17462d22 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java @@ -0,0 +1,14 @@ +package com.jero.pack.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.pack.entity.PayPackCompany; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +public interface IPayPackCompanyService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java new file mode 100644 index 00000000..778d6494 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.pack.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.pack.entity.PayPackCompanyProject; +import com.jero.pack.mapper.PayPackCompanyProjectMapper; +import com.jero.pack.service.IPayPackCompanyProjectService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_pack_company_project + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PayPackCompanyProjectServiceImpl extends ServiceImpl implements IPayPackCompanyProjectService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java new file mode 100644 index 00000000..30adb563 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -0,0 +1,18 @@ +package com.jero.pack.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.mapper.PayPackCompanyMapper; +import com.jero.pack.service.IPayPackCompanyService; +import org.springframework.stereotype.Service; + +/** + * @Description: pay_pack_company + * @Author: jeecg-boot + * @Date: 2021-09-07 + * @Version: V1.0 + */ +@Service +public class PayPackCompanyServiceImpl extends ServiceImpl implements IPayPackCompanyService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index c49c6bb8..8473478c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -83,7 +83,7 @@ public class PayCommonProjectController extends JeroController listProjectId = list.stream().map(PayCommonProject::getId).collect(Collectors.toList()); // 获取已经关联合同的普通项目 LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getId, listProjectId); + queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getProjectId, listProjectId); queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType, PayProjectCommon.PROJECT_TYPE1); List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); List listProjectIdNew = new ArrayList<>(); @@ -114,12 +114,13 @@ public class PayCommonProjectController extends JeroController finalListProjectId = listProjectIdNew; listNew.forEach(p->{ // 没有关联合同 - if(!CollectionUtils.isEmpty(finalListProjectId) && !finalListProjectId.contains(p.getId())){ - if(!StringUtils.isBlank(p.getChargeUse())){ - p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); - } - listPayCommonProjectOutputNew.add(p); + if(!CollectionUtils.isEmpty(finalListProjectId) && finalListProjectId.contains(p.getId())){ + return; } + if(!StringUtils.isBlank(p.getChargeUse())){ + p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",p.getChargeUse())); + } + listPayCommonProjectOutputNew.add(p); }); } return Result.OK(listPayCommonProjectOutputNew); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 968325a1..7c1e164a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -98,7 +98,7 @@ public class PayWorkingGroupController extends JeroController Date: Tue, 7 Sep 2021 16:26:01 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E4=BC=9A=E8=AE=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BA=A4=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingController.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 5516ceee..06fd5bc4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -1,14 +1,13 @@ package com.jero.meeting.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.jero.common.api.vo.Result; @@ -76,6 +75,22 @@ public class PayMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); + String meetingStartTime = req.getParameter("meetingStartTime"); + String meetingEndTime = req.getParameter("meetingEndTime"); + if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) + ); + }else if (ObjectUtil.isNotEmpty(meetingStartTime)){ + queryWrapper.not( + a -> a.lt("end_time", meetingStartTime) + ); + }else if (ObjectUtil.isNotEmpty(meetingEndTime)){ + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime) + ); + } + Page page = new Page<>(pageNo, pageSize); IPage pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { From cfa49cf3b7af0d61bce50f9fe22bf57557d4ef29 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 7 Sep 2021 16:46:02 +0800 Subject: [PATCH 06/11] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20[=E4=BC=9A=E8=AE=AE=E8=B5=84=E6=96=99?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E6=8F=90=E9=86=92]=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/meeting/entity/PayMeeting.java | 12 ++++++++++-- .../java/com/jero/meeting/vo/PayMeetingVO.java | 14 +++++++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index a8fcbffb..8afd284d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -218,7 +218,15 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "备注") private String remark; - /**会议文件*/ - @ApiModelProperty(value = "备注") + /**会议通知文件*/ + @ApiModelProperty(value = "会议通知文件") private String meetingFiles; + + /**会议资料*/ + @ApiModelProperty(value = "会议资料") + private String meetingData; + + /**是否提醒*/ + @ApiModelProperty(value = "是否提醒") + private Integer remind; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java index 4c5a9522..5e78dd4b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java @@ -229,9 +229,17 @@ public class PayMeetingVO implements Serializable { @Size(max = 200, message = "备注最大为200字符") private String remark; - /**会议文件*/ - @ApiModelProperty(value = "备注") - @Size(max = 1000, message = "会议文件数量超出最大限制") + /**会议通知文件*/ + @ApiModelProperty(value = "会议通知文件") + @Size(max = 1000, message = "会议通知文件数量超出最大限制") private String meetingFiles; + /**会议资料*/ + @ApiModelProperty(value = "会议资料") + @Size(max = 1000, message = "会议资料数量超出最大限制") + private String meetingData; + + /**是否提醒*/ + @ApiModelProperty(value = "是否提醒") + private Integer remind; } From 915bf0a1016f430b827bc6283e5a1440f7e6e5d9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 7 Sep 2021 16:46:19 +0800 Subject: [PATCH 07/11] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20[=E4=BC=9A=E8=AE=AE=E8=B5=84=E6=96=99?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E6=8F=90=E9=86=92]=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/pay.pdm | 1186 +++++++++++++++++++++++++++------------------------- 1 file changed, 605 insertions(+), 581 deletions(-) diff --git a/db/pay.pdm b/db/pay.pdm index 70e3cc2f..5a452781 100644 --- a/db/pay.pdm +++ b/db/pay.pdm @@ -1,5 +1,5 @@ - + @@ -5190,8 +5190,8 @@ Shadow=0 1629862221 1630635158 -((914,8288), (8801,9688)) -((1314,8988),(8401,8988)) +((914,8233), (8801,9633)) +((1314,8933),(8401,8933)) 1 8 16744576 @@ -5210,8 +5210,8 @@ Shadow=0 1630570814 1630635158 -((-27428,3237), (-22334,4637)) -((-22734,3937),(-27028,3937)) +((-27428,3040), (-22334,4440)) +((-22734,3740),(-27028,3740)) 1 8 16744576 @@ -5231,7 +5231,7 @@ Shadow=0 1629862221 1630635158 -1 -((-22734,-3771), (1314,25701)) +((-22734,-4596), (1314,26526)) 12615680 16570034 12632256 @@ -10235,7 +10235,7 @@ LABL 0 新宋体,8,N pay_meeting 1629855889 lilili -1630635114 +1631004116 lilili 会议项目表 ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic @@ -10659,19 +10659,43 @@ LABL 0 新宋体,8,N 580B4B13-CBB6-479C-BF3D-8F529E9DB603 -会议文件 +会议通知文件 meeting_files 1630635083 lilili -1630635177 +1631004116 lilili -会议文件 +会议通知文件 varchar(1000) 1000 + +30CCF419-8739-4EA8-9F7B-E7421E1691FD +会议资料 +meeting_data +1631003930 +lilili +1631004116 +lilili +会议资料 +varchar(1000) +1000 + + +4FF5F01D-BD39-43BB-981C-BBC34CC5D579 +是否提醒 +remind +1631003930 +lilili +1631004127 +lilili +是否提醒 +int(2) +2 + - + 518DA6FD-4CE5-4DB9-A3E6-ECD9401C2A8D Index_1 Index_1 @@ -10681,7 +10705,7 @@ LABL 0 新宋体,8,N lilili 1 - + EF9599B8-0ABE-40AB-9D04-BDEFD221EAE1 1629858921 lilili @@ -10706,7 +10730,7 @@ LABL 0 新宋体,8,N 会议报名表 - + EAE40582-7B74-466C-87D3-F19CC3C62BA4 id id @@ -10719,7 +10743,7 @@ LABL 0 新宋体,8,N 36 1 - + 0F119C58-2CBC-4A7D-B996-A6D107A08C34 创建人 create_by @@ -10731,7 +10755,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 4D177524-4CA0-4C22-835A-74D1A09FD959 创建日期 create_time @@ -10742,7 +10766,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + 9E30B20B-198B-40BE-B79B-39432F919179 更新人 update_by @@ -10754,7 +10778,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7D9FFF88-8689-4D29-A105-8168658D852C 更新日期 update_time @@ -10765,7 +10789,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + 423909A7-3ED8-41FA-B476-B43974B57852 会议id meeting_id @@ -10777,7 +10801,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 5DDDD9C0-46E0-44BC-AA90-E290EB16C500 企业id company_id @@ -10789,7 +10813,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + F2DA1C64-B401-4F17-82F2-112AAC6229CA 企业名称 company_name @@ -10801,7 +10825,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6420F129-FE0A-4B8D-8B78-998E4AAFF7E8 姓名 user_name @@ -10813,7 +10837,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + AB61178B-211A-450A-B57D-0C199AD0F385 身份 identity @@ -10825,7 +10849,7 @@ LABL 0 新宋体,8,N int(2) 2 - + C139644F-3244-4BC5-982D-9B65A412B5E9 手机号 phone @@ -10837,7 +10861,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 10527EC0-85F1-41ED-9824-D49C74F466AA 是否入住协议酒店 check_in_hotel @@ -10849,7 +10873,7 @@ LABL 0 新宋体,8,N int(2) 2 - + C80C14FC-596A-479C-A670-636CF1CEC425 抵达时间 arrival_time @@ -10860,7 +10884,7 @@ LABL 0 新宋体,8,N 抵达时间 datetime - + 07AE0506-0F74-4D54-BA0F-74C3FDCC9A25 离开时间 leave_time @@ -10871,7 +10895,7 @@ LABL 0 新宋体,8,N 离开时间 datetime - + 5D4700C1-3E02-40E4-A4A4-FED74AEB11F5 缴费方式 pay_mode @@ -10883,7 +10907,7 @@ LABL 0 新宋体,8,N int(2) 2 - + 0AE489AF-15BF-4A62-91D1-8AABB57A58A2 需要发票 need_invoice @@ -10895,7 +10919,7 @@ LABL 0 新宋体,8,N int(2) 2 - + A9BD46E2-E94B-4104-A4B5-C842CF98BFF2 状态（导入、未导入） status @@ -10907,7 +10931,7 @@ LABL 0 新宋体,8,N int(2) 2 - + DC248113-788F-47BB-9280-9BB2218C7172 是否为新增 is_new @@ -10921,7 +10945,7 @@ LABL 0 新宋体,8,N - + 8EAFB8D1-E324-4325-9ADF-5A199B6AC918 Key_1 Key_1 @@ -10930,12 +10954,12 @@ LABL 0 新宋体,8,N 1629862369 lilili - + - + 9A1865DC-C350-4094-A4D3-0FCB4FA3DB25 Index_1 Index_1 @@ -10945,21 +10969,21 @@ LABL 0 新宋体,8,N lilili 1 - + 8409280A-FDD6-4EF6-969C-3EF576DF83E9 1629862369 lilili 1629862377 lilili - + - + @@ -10973,7 +10997,7 @@ LABL 0 新宋体,8,N 票据邮寄表 - + AC098306-29A3-4435-A05C-757966CCA2E2 id id @@ -10985,7 +11009,7 @@ LABL 0 新宋体,8,N varchar(36) 36 - + 1C668D89-D229-4453-ACAF-9F625B3982AD 创建人 create_by @@ -10997,7 +11021,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + FBAC8348-80F3-4C4F-801F-FC22124A6416 创建日期 create_time @@ -11008,7 +11032,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + B26A31F0-E43D-4506-8238-CF72A2DE33B3 更新人 update_by @@ -11020,7 +11044,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6E067861-387D-46E5-AC94-49FE26CD0475 更新日期 update_time @@ -11031,7 +11055,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + 2CD1F93D-D570-4244-890E-D22A6540BFAF 票号 bill_no @@ -11043,7 +11067,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 0B0294C3-115B-4352-A6D6-293321DFE31B 开票金额 invoice_amount @@ -11055,7 +11079,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 0445147D-BA8F-44A1-8ECE-B1D7539958BD 邮寄状态(1:未邮寄，2::已邮寄) post_status @@ -11067,7 +11091,7 @@ LABL 0 新宋体,8,N int(2) 2 - + C34C0F9E-8778-44E5-8117-5B7895DE2180 快递公司(1:EMS,2:顺丰) send_method @@ -11079,7 +11103,7 @@ LABL 0 新宋体,8,N int(2) 2 - + 98EAA065-2E5A-4FB9-A1FD-57728EAB8C82 快递单号 postNo @@ -11091,7 +11115,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 42F980D5-A151-4E32-8D10-24ABBFC116F7 邮寄时间 sendDate @@ -11102,7 +11126,7 @@ LABL 0 新宋体,8,N 邮寄时间 datetime - + 152F8AC8-70CD-470E-ADD9-749CF5545846 备注 remark @@ -11127,7 +11151,7 @@ LABL 0 新宋体,8,N 催款记录表 - + D6D407E9-5FC2-4BB0-982A-A26C9BF47571 id id @@ -11139,7 +11163,7 @@ LABL 0 新宋体,8,N varchar(36) 36 - + 40005F46-7CAC-4521-863A-D3D95E9E3AAF 创建人 create_by @@ -11151,7 +11175,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 8D9B8558-0536-458E-9066-FAB835A0414D 创建日期 create_time @@ -11162,7 +11186,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + 56EE421A-F3BE-4F13-A169-5935A218D507 更新人 update_by @@ -11174,7 +11198,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 5D87BC72-ED9F-4FA5-8D20-115635E25A0B 更新日期 update_time @@ -11185,7 +11209,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + D5B4E8B5-CA85-4B6A-B3F0-3BA6F37E9D33 项目id project_id @@ -11197,7 +11221,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 472130D9-B604-47B8-855B-E6F8580A6F95 项目类型 project_type @@ -11222,7 +11246,7 @@ LABL 0 新宋体,8,N 来款记录表 - + 695E88F4-A349-444A-8B3B-3B7F6F21F369 id id @@ -11235,7 +11259,7 @@ LABL 0 新宋体,8,N 36 1 - + CCA66C8C-7E1C-4E4F-8FA7-519D98202173 创建人 create_by @@ -11247,7 +11271,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 263154D3-A4A7-4B76-9BFB-1EDE4557749F 创建日期 create_time @@ -11258,7 +11282,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + 9178D7CE-28DC-4467-9F80-C38AFDFEAB03 更新人 update_by @@ -11270,7 +11294,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 55EDE403-BAB4-4BA0-B063-9C500BCE1C45 更新日期 update_time @@ -11281,7 +11305,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + 5427108C-6D65-472A-B7B6-D55620ECBB30 到账金额 amount_received @@ -11293,7 +11317,7 @@ LABL 0 新宋体,8,N int(11) 11 - + A34A2CFF-7D10-495D-9DD8-DEC729BF95C7 来款日期 payment_date @@ -11304,7 +11328,7 @@ LABL 0 新宋体,8,N 来款日期 date - + 4FDEF61C-9585-4929-8FC1-CD602DCA7F87 备注 remark @@ -11316,7 +11340,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + AD2AEDB5-0FBE-4CB8-9AB9-9770E2E97EFB 项目id project_id @@ -11330,7 +11354,7 @@ LABL 0 新宋体,8,N - + A00ADFE1-2E37-4575-8CA4-BAAE38C9C400 Key_1 Key_1 @@ -11339,12 +11363,12 @@ LABL 0 新宋体,8,N 1629948780 lilili - + - + @@ -11358,7 +11382,7 @@ LABL 0 新宋体,8,N 会议关联酒店联系人表 - + 79D40983-6B03-4AA7-A5EE-324E59118C38 id id @@ -11371,7 +11395,7 @@ LABL 0 新宋体,8,N 36 1 - + D4126CDC-C004-4A7D-B302-8E698A9978FB 会议id meeting_id @@ -11383,7 +11407,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 820303F6-A685-45C5-9AF3-8B04636F82B3 酒店联系人 hotel_contacts @@ -11396,7 +11420,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 95D2FC73-65B7-4BFF-8539-77C518945896 酒店联系人电话 hotel_contacts_phone @@ -11410,7 +11434,7 @@ LABL 0 新宋体,8,N - + 593525B5-1FFF-447B-91BB-97682E4EAC73 Key_1 Key_1 @@ -11419,12 +11443,12 @@ LABL 0 新宋体,8,N 1630570234 lilili - + - + 710AAEC8-DAD7-4996-B620-4243DE004DB9 Index_1 Index_1 @@ -11434,21 +11458,21 @@ LABL 0 新宋体,8,N lilili 1 - + 4D357558-1A89-4E44-A0E4-A7A084CF918D 1629862369 lilili 1630570234 lilili - + - + @@ -11462,7 +11486,7 @@ LABL 0 新宋体,8,N 工作组成员表 - + B5ABBE13-8978-41E1-AD3F-DDDB20E1C4E9 主键 id @@ -11474,7 +11498,7 @@ LABL 0 新宋体,8,N 32 1 - + FA06DEF1-C390-43C4-A7C2-A2003A9407D4 来款项目 charge_project @@ -11485,7 +11509,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + CD60E39C-8BF1-4896-B61C-E186151F75A9 工作组id working_group_id @@ -11496,7 +11520,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 87C72511-5B50-4472-88FF-CD374E48DCB2 成员单位id charge_company_id @@ -11507,7 +11531,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 2716D9B8-1E27-4E6C-A1BD-B7A6A6AABC1C 临时成员单位id charge_company_temporary_id @@ -11518,7 +11542,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 725024E0-E4DB-4415-BAAF-0251777913B2 临时成员单位 charge_company_temporary_name @@ -11529,7 +11553,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + B0B36BF8-CB06-4123-9358-7968B9ED05B3 企业联系人一id contacts_id_one @@ -11540,7 +11564,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F7D9C9AD-ABD6-46AF-BC4F-D42B0D197778 临时企业联系人一id contacts_temporary_id_one @@ -11551,7 +11575,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + E829F526-4815-4DE3-B2D4-1F6C1ADDE4F3 临时企业联系人二id contacts_temporary_id_two @@ -11562,7 +11586,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + FD06AECC-66A5-43B6-B444-E6C772446126 企业联系人二id contacts_id_two @@ -11573,7 +11597,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0F74439B-D128-493F-9218-8F25B8C87424 临时企业联系人二名称 contacts_temporary_name_two @@ -11584,7 +11608,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A8A995D0-ACF5-41E9-9EE3-18AF7E472999 临时企业联系人一名称 contacts_temporary_name_one @@ -11595,7 +11619,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + CBA5A7CD-63FA-49CA-B76F-361BEC65554E 企业联系人三id contacts_id_three @@ -11606,7 +11630,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3860C8C2-D477-4115-B52A-CB987C997AC3 临时企业联系人三id contacts_temporary_id_three @@ -11617,7 +11641,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 9242DBB2-1C9C-45D9-9231-27103B5C19BD 临时企业联系人三名称 contacts_temporary_name_three @@ -11628,7 +11652,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 8CF293BE-178C-4A08-BD54-5B4A5A5092DB 应收金额（元） receivable_amount @@ -11638,7 +11662,7 @@ LABL 0 新宋体,8,N lilili int - + 51734E8E-7EFC-451F-BFBF-932C3C7D0CA4 实收金额（元） paid_amount @@ -11648,7 +11672,7 @@ LABL 0 新宋体,8,N lilili int - + 599BA026-2429-46FF-9CCF-496D622FF7D4 邮寄联系人id mail_contacts_id @@ -11659,7 +11683,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1350EB09-8F46-4695-98A8-FA7BCA8D795C 临时邮寄联系人id mail_contacts_temporary_id @@ -11670,7 +11694,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A6F98351-3DFD-4333-9587-208C9ED87372 临时邮寄联系人名称 mail_contacts_temporary_name @@ -11681,7 +11705,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 947979AC-1726-4E2B-B599-EBBEE0FC304A 来款方式（1：无，2：合同，3：收费通知） charge_way @@ -11692,7 +11716,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 12679DF0-86C0-44E4-A6CB-0DC8BE5F11F6 合同编号 contract_num @@ -11703,7 +11727,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 3FAF2FB8-1D40-4E6A-9C59-EF2BD998D969 收费通知号 charge_notice_no @@ -11714,7 +11738,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C0EF0A3D-421E-4C27-99AF-C87EB568D214 收费通知文件id charge_notice_id @@ -11725,7 +11749,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 2A1800A1-7DA5-4840-99A7-8A18EAD1670B 打包（1：是，0：否） packaging @@ -11736,7 +11760,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + B9BEBBDA-5F8E-425A-9B9C-EF2E467C8AE0 需要发票（1：增值税普通发票，2：增值税专用发票，0：否） invoice @@ -11747,7 +11771,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 25A703C2-E64E-49DD-AB76-3C50EF64E458 到账（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） in_account @@ -11758,7 +11782,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 04A75917-391D-400A-B75F-7D193CDDAB93 开票（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） make_invoice @@ -11769,7 +11793,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + B7AFDF66-D1B6-47E6-8D83-32A9AE1382C3 邮寄（（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志））） mail @@ -11780,7 +11804,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 9C19895C-62E4-4D33-AD08-160BB198021F 催款次数 press_money_times @@ -11790,7 +11814,7 @@ LABL 0 新宋体,8,N lilili int - + B2F0059B-23E3-4651-BAAA-BA50950E8AB8 备注 remarks @@ -11801,7 +11825,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 0C0BDC77-06A2-4032-9969-C46B9E1D4490 创建人 create_by @@ -11812,7 +11836,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EA969A8F-967D-4A3C-B1EA-C3C30D6CEF00 创建时间 create_time @@ -11822,7 +11846,7 @@ LABL 0 新宋体,8,N lilili datetime - + E26405A2-1358-46A4-B900-6E81DF0FD4D8 更新人 update_by @@ -11833,7 +11857,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8721D655-08B2-43B4-88F0-85D251A7E083 更新时间 update_time @@ -11845,7 +11869,7 @@ LABL 0 新宋体,8,N - + 4C6442E1-D5B3-4230-9543-29296B2D6B36 来款单位 working_group_company_index @@ -11868,7 +11892,7 @@ LABL 0 新宋体,8,N 工作组表 - + 0B0B502F-09B3-452E-A60C-D129BECF8660 主键 id @@ -11880,7 +11904,7 @@ LABL 0 新宋体,8,N 32 1 - + 37C312F3-AF20-4D83-AF74-046A4DF22008 工作组项目 working_group_project @@ -11891,7 +11915,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E9EFCC62-2C07-4F40-A1F7-F191DF49CE9C 运行年份 year @@ -11902,7 +11926,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + FBA5EA91-779E-49BA-8B91-F7AFE8E1906C 负责人Aid principal_id_a @@ -11913,7 +11937,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 890C9A0A-160D-452A-80C3-7B29014BAFC4 负责人名称A principal_name_a @@ -11924,7 +11948,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + F2BC0536-31A7-497F-B3EA-8F4E4B417445 负责人Bid principal_id_b @@ -11935,7 +11959,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + ACE06185-91E1-4E8A-8265-8E8681F11BD5 负责人名称B principal_name_b @@ -11946,7 +11970,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 282FEF2F-FE84-42C6-9079-0B2935A00888 每年召开次数 convoke_num @@ -11957,7 +11981,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6FD9CD8A-E5D4-4DCF-B025-3BB40AAC3C66 运行周期 operation_cycle @@ -11968,7 +11992,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + D6549E68-1633-41E2-ABF6-9DA2DAD29C92 本年应收款A（元） year_charge_a @@ -11978,7 +12002,7 @@ LABL 0 新宋体,8,N lilili int - + 7004849B-2132-4855-A89F-0A6E11E86419 收费通知号A charge_notice_no_a @@ -11989,7 +12013,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 4E5C892B-78E1-41FA-8A16-0003A0669EA5 收费通知文件Aid charge_notice_a_id @@ -12000,7 +12024,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A3D2F294-4EAB-462C-9521-88E7FAD67CF3 本年应收款B（元） year_charge_b @@ -12010,7 +12034,7 @@ LABL 0 新宋体,8,N lilili int - + 453EFDD4-C287-4120-9352-531C9530494E 收费通知号B charge_notice_no_b @@ -12021,7 +12045,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 614D3A6C-D3D2-44D6-A468-62E8B2057359 收费通知文件Bid charge_notice_b_id @@ -12032,7 +12056,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 34CE6F70-AC0B-4DEE-AD1A-33626E16B646 任务及目标 mission_and_objectives @@ -12043,7 +12067,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + FDAC4C4D-06F6-4939-A58D-5F11A08B598C 备注 remarks @@ -12054,7 +12078,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 1B1AD954-EAED-49AD-B76D-64CC770DF594 创建人 create_by @@ -12065,7 +12089,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + C1FEA3A7-C5FC-460A-B68C-B46A3EC9B9E6 创建时间 create_time @@ -12075,7 +12099,7 @@ LABL 0 新宋体,8,N lilili datetime - + 28DB2D37-7F61-4349-843E-1F6002620A89 更新人 update_by @@ -12086,7 +12110,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F5BE8261-722D-4677-9448-ABF2996AC5B7 更新时间 update_time @@ -12098,7 +12122,7 @@ LABL 0 新宋体,8,N - + 792474F8-1713-42EB-B6E2-811C33EC9466 Key_1 Key_1 @@ -12107,12 +12131,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 6658A94F-38AA-4F30-B611-87C3C8990B39 工作组项目 working_group_project_index @@ -12122,43 +12146,43 @@ LABL 0 新宋体,8,N lilili 工作组项目 - + 3E24137B-E1B9-4C3F-9D35-3168A1BEAEDC 1629856948 lilili 1630635062 lilili - - - - - - -6546CF72-E9C0-4E08-86D1-8801479AD147 -负责人 -working_group_principal_id_a -1629856875 -lilili -1630635062 -lilili -负责人 - - -88DB043D-5B8D-4B0C-A741-BBA2E6918FC5 -1629856965 -lilili -1630635062 -lilili - + +6546CF72-E9C0-4E08-86D1-8801479AD147 +负责人 +working_group_principal_id_a +1629856875 +lilili +1630635062 +lilili +负责人 + + +88DB043D-5B8D-4B0C-A741-BBA2E6918FC5 +1629856965 +lilili +1630635062 +lilili + + + + + + - + @@ -12172,7 +12196,7 @@ LABL 0 新宋体,8,N 普通项目表 - + 63462E2F-51E6-472D-9EAE-E0C73B1AE913 主键 id @@ -12184,7 +12208,7 @@ LABL 0 新宋体,8,N 32 1 - + 6FFAFB84-D16E-405A-9F13-A8E91F04BE7C 来款项目 charge_project @@ -12195,7 +12219,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 833CC620-E985-4294-B750-181BE1D82A8F 运行年份 year @@ -12206,7 +12230,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + BB306185-DB46-4626-8FB9-F577C1FFAD21 负责人id principal_id @@ -12217,7 +12241,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4AFF82EC-F2FD-4A57-80DC-C65512E24D34 负责人名称 principal_name @@ -12228,7 +12252,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 5EC925EE-C2F1-4E90-B0AB-105FE7BB4DDF 来款企业id charge_company_id @@ -12239,7 +12263,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 6B67F117-D2DF-4929-822D-D2D6F792B77F 临时来款企业id charge_company_temporary_id @@ -12250,7 +12274,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D61897CB-CA63-4D60-B3E1-F3318CE05C2B 临时来款企业 charge_company_temporary_name @@ -12261,7 +12285,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + BF4B0BC2-0CE5-4F9D-8163-65629E82B3C4 来款用途（字典表） charge_use @@ -12272,7 +12296,7 @@ LABL 0 新宋体,8,N varchar(2) 2 - + 0288BBCC-C5E0-4EF9-83D8-74943138BA1B 联系人id contacts_id @@ -12283,7 +12307,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F6DA9245-6EDC-403C-9BD1-EEEDB30F4F6A 临时联系人id contacts_temporary_id @@ -12294,7 +12318,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F39BF7D4-8D64-4D6B-841B-F8C0F7923AC4 临时联系人名称 contacts_temporary_name @@ -12305,7 +12329,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 369BDC16-A44F-4B75-8874-0631693CEE9E 应收金额（元） receivable_amount @@ -12315,7 +12339,7 @@ LABL 0 新宋体,8,N lilili int - + 167F9B0B-B39E-4228-9AD0-B0858D4EF249 实收金额（元） paid_amount @@ -12325,7 +12349,7 @@ LABL 0 新宋体,8,N lilili int - + A259A3D6-F851-4391-90CC-C8B084B3F73B 邮寄联系人id mail_contacts_id @@ -12336,7 +12360,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 800150C5-A914-4F1C-B805-F0636121D9FA 临时邮寄联系人id mail_contacts_temporary_id @@ -12347,7 +12371,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + DD354327-3611-4808-9D0A-1ACB0B7FB120 临时邮寄联系人名称 mail_contacts_temporary_name @@ -12358,7 +12382,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 21AD801D-ED52-4956-803D-848AAD99C5C9 打包（1：是，0：否） packaging @@ -12369,7 +12393,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 55C6BA44-7961-4306-A84C-FC08C4EF8245 需要发票（1：增值税普通发票，2：增值税专用发票，0：否） invoice @@ -12380,7 +12404,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 1B1DDA6C-7373-4897-B9AA-F4D09644C020 到账（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） in_account @@ -12391,7 +12415,7 @@ LABL 0 新宋体,8,N varchar(1) 1 - + 850B2466-AC5F-427B-9DE2-A72ABD427D6B 开票（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） make_invoice @@ -12402,7 +12426,7 @@ LABL 0 新宋体,8,N varchar(1) 1 - + 115A72E9-CA69-4C44-A218-9A025E7212BB 邮寄（（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志））） mail @@ -12413,7 +12437,7 @@ LABL 0 新宋体,8,N varchar(1) 1 - + 3D9E9A93-8623-4357-993A-AB979B672C9A 来款方式（1：无，2：合同，3：收费通知） charge_way @@ -12424,7 +12448,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 6B4ABDF0-5D2E-48AB-9374-D74DE0FC0CE7 合同编号 contract_num @@ -12435,7 +12459,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7503A1EA-5104-4B1F-ABA6-97FE62EABE03 收费通知号 charge_notice_no @@ -12446,7 +12470,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C36FB5BB-CF8F-463F-9B49-2008A9585FE7 收费通知文件id charge_notice_id @@ -12457,7 +12481,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1CE1B1B6-BC40-42C7-BE00-860570215C7A 催款次数 press_money_times @@ -12467,7 +12491,7 @@ LABL 0 新宋体,8,N lilili int - + A5553767-6FAB-46C7-8806-EB35DD867DDA 备注 remarks @@ -12478,7 +12502,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 680D3ED2-6A95-47D0-95E8-7010B7DD8893 创建人 create_by @@ -12489,7 +12513,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0BBC3A06-F250-486E-A055-AE01568FA982 创建时间 create_time @@ -12499,7 +12523,7 @@ LABL 0 新宋体,8,N lilili datetime - + 4F1919DF-B28C-41D8-9A33-DF0C14C0BCCB 更新人 update_by @@ -12510,7 +12534,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EA0F5715-1D1A-41C6-9B8B-444D9EB1B01B 更新时间 update_time @@ -12522,7 +12546,7 @@ LABL 0 新宋体,8,N - + C4B3377E-81E6-4C03-AE04-2C5E582065EF Key_1 Key_1 @@ -12531,12 +12555,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + BF6C9CB2-1FB7-42F8-9C80-A523C6E25F31 来款项目 common_project_charge_index @@ -12546,51 +12570,51 @@ LABL 0 新宋体,8,N lilili 来款项目 - + 44F869AD-24FF-4AA6-981B-92A0EDF415B4 1629856670 lilili 1630635062 lilili - - - - - - -FE225FC3-33D7-41B4-9C44-291EFAAD7000 -来款单位 -common_project_company_index -1629856670 -lilili -1630635062 -lilili -来款单位 - - -FC888FA1-42F5-48BF-9859-9A6151ED3F64 -负责人id -common_project_principal_id -1629856716 -lilili -1630635062 -lilili -负责人id - - -8DD80A1D-251C-4A92-B044-DA605DC899E7 -1629856809 -lilili -1630635062 -lilili - + +FE225FC3-33D7-41B4-9C44-291EFAAD7000 +来款单位 +common_project_company_index +1629856670 +lilili +1630635062 +lilili +来款单位 + +FC888FA1-42F5-48BF-9859-9A6151ED3F64 +负责人id +common_project_principal_id +1629856716 +lilili +1630635062 +lilili +负责人id + + +8DD80A1D-251C-4A92-B044-DA605DC899E7 +1629856809 +lilili +1630635062 +lilili + + + + + + + 0DCCE0F9-1B84-4DAA-936D-1D6A2644C562 联系人id common_project_contacts_id @@ -12600,21 +12624,21 @@ LABL 0 新宋体,8,N lilili 联系人id - + A8D1DAEE-EF3A-4C9C-9FC1-18A60451C534 1629856852 lilili 1630635062 lilili - + - + @@ -12627,7 +12651,7 @@ LABL 0 新宋体,8,N lilili - + 65385885-CD9C-4962-8638-13FD48A4CD4B 主键 id @@ -12639,7 +12663,7 @@ LABL 0 新宋体,8,N 32 1 - + E7A6641E-62FE-4832-B7EB-5150ACEAD59D 资料目录id data_id @@ -12650,7 +12674,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + FEAEEB79-A3A9-4D74-8AED-F72E30B36572 文件id file_id @@ -12661,7 +12685,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 36110898-0D3F-4136-9DCA-AA4EFE6B6B43 文件目录 file_path @@ -12672,7 +12696,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 222BBD9E-43C7-409F-9873-5B05013151C0 创建人 create_by @@ -12683,7 +12707,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CBE573CA-487C-4E39-B74E-D94A59F80987 创建时间 create_time @@ -12693,7 +12717,7 @@ LABL 0 新宋体,8,N lilili datetime - + 403A6235-F1A7-44BD-9B5F-556083EF214A 更新人 update_by @@ -12704,7 +12728,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + ECDEEA92-5160-4E61-8F9C-68B5FDC16EF1 更新时间 update_time @@ -12716,7 +12740,7 @@ LABL 0 新宋体,8,N - + C8E120C2-A523-43B5-AF0E-16618DA175FA Key_1 Key_1 @@ -12725,12 +12749,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -12743,7 +12767,7 @@ LABL 0 新宋体,8,N lilili - + 826308AC-8487-434F-9AF1-B4987A1E3B59 主键 id @@ -12755,7 +12779,7 @@ LABL 0 新宋体,8,N 32 1 - + FD5F9ABB-8930-4834-B15D-9648FABAE1B4 分标委id committee_id @@ -12766,7 +12790,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 519166AE-595D-485F-BF46-54B704C98785 企业id company_id @@ -12777,7 +12801,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 98E2C063-EEDF-4F77-BFE3-BA9040E0E696 企业名称 company_name @@ -12788,7 +12812,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 11ED1513-C13C-4392-964B-4222E345462F 联系人id contacts_id @@ -12799,7 +12823,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 5F3DAE08-C970-4444-A63E-39496DA35D8E 联系人名称 contacts_name @@ -12810,7 +12834,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 87F3AB90-31B0-4730-8AE6-00D80FDB63E7 创建人 create_by @@ -12821,7 +12845,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + C31D0F90-3D52-4BB7-9D7A-5670B6D6B4FB 创建时间 create_time @@ -12831,7 +12855,7 @@ LABL 0 新宋体,8,N lilili datetime - + DF0C9838-6EEF-42ED-B703-57DAE61DA4B2 更新人 update_by @@ -12842,7 +12866,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D58433BE-E21B-4225-983D-D33FD9899558 更新时间 update_time @@ -12854,7 +12878,7 @@ LABL 0 新宋体,8,N - + C3C1B239-3C57-47D6-A553-1712DEFA1D3B Key_1 Key_1 @@ -12863,12 +12887,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 2AFB29AF-8C26-4679-9DF5-75CA91D3F09F 企业名称 committee_company_name_index @@ -12878,43 +12902,43 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 25EAC282-A8EF-48E2-BB80-84465E4FCE4B 1629855390 lilili 1630635062 lilili - - - - - - -90447335-F190-4595-A45A-393C779E77DD -姓名 -committee_name_index -1629855390 -lilili -1630635062 -lilili -姓名 - - -EE15AB09-36F0-4C5E-B8C7-908220E72CA1 -1629855421 -lilili -1630635062 -lilili - + +90447335-F190-4595-A45A-393C779E77DD +姓名 +committee_name_index +1629855390 +lilili +1630635062 +lilili +姓名 + + +EE15AB09-36F0-4C5E-B8C7-908220E72CA1 +1629855421 +lilili +1630635062 +lilili + + + + + + - + @@ -12927,7 +12951,7 @@ LABL 0 新宋体,8,N lilili - + 129E765E-9D82-4C3D-936B-405159030FD5 主键 id @@ -12939,7 +12963,7 @@ LABL 0 新宋体,8,N 32 1 - + 19997065-FB77-4248-9A70-3E0C8511B3CC 资料文件id data_file_id @@ -12950,7 +12974,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4279225A-E598-45E9-90F9-D2FFC298F352 联系人id contacts_id @@ -12961,7 +12985,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 74CC6337-2E11-4EFE-8287-E40CE7DBD029 联系人名称 contacts_name @@ -12972,7 +12996,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 71392DFC-4E1F-4825-B87F-0B5E33ED94F0 创建人 create_by @@ -12983,7 +13007,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1E332EB2-A1F4-405A-98B1-638203BA7E3E 创建时间 create_time @@ -12993,7 +13017,7 @@ LABL 0 新宋体,8,N lilili datetime - + FE7A2728-BA70-444A-B511-47516761D478 更新人 update_by @@ -13004,7 +13028,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CBD3FEF7-3F98-476A-ACA5-421740EC0838 更新时间 update_time @@ -13016,7 +13040,7 @@ LABL 0 新宋体,8,N - + 368FC886-3056-4C52-BCE1-22B959B08778 Key_1 Key_1 @@ -13025,12 +13049,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -13043,7 +13067,7 @@ LABL 0 新宋体,8,N lilili - + 32193E18-AE37-4059-A80F-0804C62DCEF8 主键 id @@ -13055,7 +13079,7 @@ LABL 0 新宋体,8,N 32 1 - + 993E44B1-29A7-435F-B770-118A30AF8952 文件id file_id @@ -13066,7 +13090,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EAFDEAC2-468F-4251-8742-74CEF5F1ECD3 文件名称 file_name @@ -13077,7 +13101,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + DD7B1CA1-3204-4518-8CE6-6A52A28017B5 文件目录 file_path @@ -13088,7 +13112,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F7AB7A05-2AFA-429C-BBC1-145DCDF64D72 企业名称 company_name @@ -13099,7 +13123,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7F72011B-531E-403E-A5C2-4832FFA12415 下载用户名称 download_name @@ -13110,7 +13134,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 317DADDE-2DA7-46BC-9EEF-DF94C37B1BB3 会议名称 meeting_name @@ -13121,7 +13145,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C9E42352-2618-44F9-BA86-8A3D99A7A2C6 创建人 create_by @@ -13132,7 +13156,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F7F9D52C-7A79-4969-B5D4-FA4B3B5E7522 创建时间 create_time @@ -13142,7 +13166,7 @@ LABL 0 新宋体,8,N lilili datetime - + FBBDC379-5B99-4D2D-9B51-193B54ED3D96 更新人 update_by @@ -13153,7 +13177,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 727F342E-4F93-4AA5-86CE-C14A1292FE08 更新时间 update_time @@ -13165,7 +13189,7 @@ LABL 0 新宋体,8,N - + A1D9E4FA-C284-41D5-90C5-192B277D17BF Key_1 Key_1 @@ -13174,12 +13198,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + AC561227-BFDC-445F-BF5E-03AA1C45A969 文件名称 file_name_index @@ -13189,19 +13213,19 @@ LABL 0 新宋体,8,N lilili 文件名称 - + F30A3EDB-11E2-494D-AF33-8ACDDB779B87 1629855750 lilili 1630635062 lilili - + - + 056DD5B6-CAA4-424A-A2A8-4FD2845F2335 用户名称 file_download_name_index @@ -13211,19 +13235,19 @@ LABL 0 新宋体,8,N lilili 用户名称 - + B63A0E3E-F590-4E7D-BEA3-E151B19207FB 1629855886 lilili 1630635062 lilili - + - + 9FBF559B-FBEA-4BA4-8CDB-282BAB073257 会议名称 file_meeting_name_index @@ -13233,19 +13257,19 @@ LABL 0 新宋体,8,N lilili 会议名称 - + 20116498-CE11-4CCF-83E9-8FE37C460502 1629855906 lilili 1630635062 lilili - + - + 722240D2-3F5A-4694-8C7F-AA22B1F78CB4 企业名称 file_company_name_index @@ -13255,21 +13279,21 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 40A81347-F6B6-4D1D-BAC3-44C8A1E82B75 1629855915 lilili 1630635062 lilili - + - + @@ -13282,7 +13306,7 @@ LABL 0 新宋体,8,N lilili - + 44BE483B-AD75-412F-B5BE-FBFA9A8FBA6F 主键 id @@ -13294,7 +13318,7 @@ LABL 0 新宋体,8,N 32 1 - + 2AABB204-7942-4BCB-8220-59F61D5876A8 父id parent_id @@ -13305,7 +13329,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1ED80A2E-D3A4-4C2A-9D24-159DBF1492CA 名称 name @@ -13316,7 +13340,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 58011347-1E14-4C7C-B19C-023D4BFACAFA 排序号 sort @@ -13327,7 +13351,7 @@ LABL 0 新宋体,8,N varchar(3) 3 - + CACDF8EE-85E0-4ABF-903F-EC507DF72AB6 备注 remarks @@ -13338,7 +13362,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + DC70D349-2AB6-4E9A-B2A8-87259DD81833 类型(1：分标委，2：会议) type @@ -13349,7 +13373,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 798EB24D-23B1-4DBA-ADEF-AD1E9984EE97 会议id meeting_id @@ -13360,7 +13384,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CA010A91-4543-44B0-9B26-1B8696506524 创建人 create_by @@ -13371,7 +13395,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3731F33E-404F-42D7-BCF5-867391FC5E5E 创建时间 create_time @@ -13381,7 +13405,7 @@ LABL 0 新宋体,8,N lilili datetime - + F1BEF608-104D-409E-9F61-9B17888BAF40 更新人 update_by @@ -13392,7 +13416,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0DEDBF2E-1E9B-41F4-999D-A2DD622406D6 更新时间 update_time @@ -13404,7 +13428,7 @@ LABL 0 新宋体,8,N - + F6814184-F8C3-4795-9FE6-9CC8D454BD82 Key_1 Key_1 @@ -13413,12 +13437,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -13431,7 +13455,7 @@ LABL 0 新宋体,8,N lilili - + C212ABFC-D2BB-4705-ADE7-72A92112F3CF 主键 id @@ -13443,7 +13467,7 @@ LABL 0 新宋体,8,N 32 1 - + 7FDAFF74-521B-41BE-BF1C-53DE905DCF70 分标委名称 name @@ -13454,7 +13478,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C98F7B60-83D3-4E4C-995F-A2CB0E9DA427 备注 remarks @@ -13465,7 +13489,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F22875F5-7187-42DB-9FD2-5CEF0CBBF7C9 创建人 create_by @@ -13476,7 +13500,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + E74610B7-3A7D-4034-9745-3B1CA9408219 创建时间 create_time @@ -13486,7 +13510,7 @@ LABL 0 新宋体,8,N lilili datetime - + FC40975C-1230-4852-BC8B-472BCE1E79FD 更新人 update_by @@ -13497,7 +13521,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A6266403-1B0B-43CF-847B-6E82974CAFF2 更新时间 update_time @@ -13509,7 +13533,7 @@ LABL 0 新宋体,8,N - + 65BD4241-CE56-4EB3-AE9C-4FDBA79F3F84 Key_1 Key_1 @@ -13518,12 +13542,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 1B48D889-F410-4AF9-91B7-3FFA7F630F13 分标委名称 committee_name_index @@ -13533,21 +13557,21 @@ LABL 0 新宋体,8,N lilili 分标委名称 - + D2E065AB-87A2-410C-A8CC-329085839279 1629855301 lilili 1630635062 lilili - + - + @@ -13560,7 +13584,7 @@ LABL 0 新宋体,8,N LQT - + 53AF09E9-1128-47F9-8FD8-EBD4A979C8C0 主键 id @@ -13572,7 +13596,7 @@ LABL 0 新宋体,8,N 32 1 - + D113651D-C5FE-483B-95E1-0B45F2C628C4 合同id contract_id @@ -13583,7 +13607,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0D0C149A-F9E8-423E-B09D-8A523577FF35 阶段名称 phase_name @@ -13594,7 +13618,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + AEA41363-F07E-4E3A-97AE-CEE9DE36BBB7 应收金额 accounts_receivable_amount @@ -13605,7 +13629,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 44B204B5-3CC8-4955-A3FF-8BC9A68EC0E0 应收时间 accounts_receivable_time @@ -13615,7 +13639,7 @@ LABL 0 新宋体,8,N LQT date - + F7C67B9A-D07D-4E81-9BCE-1B7171F1178A 实收金额 paid_amount @@ -13626,7 +13650,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 80852A90-3EA9-4B46-8064-3DA5B659F384 实收时间 paid_time @@ -13636,7 +13660,7 @@ LABL 0 新宋体,8,N LQT date - + 56B3BE45-4096-4382-9F05-A130EAE15C3B 创建人 create_by @@ -13647,7 +13671,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7BA22E47-517F-46B1-BD27-3B9457A7E023 创建时间 create_time @@ -13657,7 +13681,7 @@ LABL 0 新宋体,8,N lilili datetime - + 5E421B0C-B51A-4844-ABB9-8B1D9D235287 更新人 update_by @@ -13668,7 +13692,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + ECF0D649-D63C-48A1-9205-4659225E900B 更新时间 update_time @@ -13680,7 +13704,7 @@ LABL 0 新宋体,8,N - + EDB7D421-706C-41EF-B5FB-CF45AF391068 Key_1 Key_1 @@ -13689,12 +13713,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -13707,7 +13731,7 @@ LABL 0 新宋体,8,N LQT - + CC509CDA-5958-46D1-BF74-83B5364BD7CF 主键 id @@ -13719,7 +13743,7 @@ LABL 0 新宋体,8,N 32 1 - + A3322CAE-907E-4FFF-BBB9-52F6BD3D459F 合同编号 contract_num @@ -13730,7 +13754,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + AD3CC7C1-4351-4222-A4B4-66954BBAF0B1 合同名称 contract_name @@ -13741,7 +13765,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 4ED01CFA-2190-4D68-9307-19AE67A3E9B9 签订单位id signed_company_id @@ -13752,7 +13776,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 51EE4934-7708-4EF9-9963-CBC32AF1BB05 临时签订单位id signed_company_temporary_id @@ -13763,7 +13787,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D0FE98C1-88A1-4ADD-AB85-BA1394DBAFC6 临时签订单位名称 signed_company_temporary_name @@ -13774,7 +13798,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 9ACA3F07-10E0-4456-BC65-29BEEF758DCC 签订单位联系人id signed_contacts_id @@ -13785,7 +13809,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 712FE759-8C89-4595-86AB-5FB1733C79C9 临时签订单位联系人id signed_contacts_temporary_id @@ -13796,7 +13820,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + BE0B6B28-7368-43B6-AABD-B854CBA3E830 临时签订单位联系人名称 signed_contacts_temporary_name @@ -13807,7 +13831,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E984017A-DB59-46B7-8AB7-84567294FD32 是否开口（1：是，0：否） opening @@ -13818,7 +13842,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 274E3F95-68FB-473D-9F94-7B9185ED6FFE 负责人id principal_id @@ -13829,7 +13853,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4FA1E6FC-9E44-429A-86BE-19A525CA6ED8 负责人名称 principal_name @@ -13840,7 +13864,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 8F4B92ED-BBE5-4A01-9369-2CB3E73EEDD2 部门名称 department_name @@ -13851,7 +13875,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 17204D6A-F657-4AFF-A164-7A045CC10CBD 签订合同金额 contract_amount @@ -13862,7 +13886,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + E9CE7A3B-7056-413B-B763-29B3A0368522 税率 rate @@ -13873,7 +13897,7 @@ LABL 0 新宋体,8,N varchar(3) 3 - + 148568DF-B910-4E14-9262-BB023348D526 未税金额 no_tax_amount @@ -13884,7 +13908,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 58507171-421D-4255-A687-53C7A3D243F8 合同签订日期 contract_date @@ -13894,7 +13918,7 @@ LABL 0 新宋体,8,N lilili date - + 0CAFE4B1-B7C8-4CF5-8B62-773DC80B6016 合同终止日期 termination_date @@ -13904,7 +13928,7 @@ LABL 0 新宋体,8,N lilili date - + D088120E-E3A0-4482-8802-517730B032E7 合同约定主要时点 contract_time_points @@ -13915,7 +13939,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 91859953-516D-4EDA-B6C2-42D2384C901E 应收金额 accounts_receivable_amount @@ -13926,7 +13950,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 798B7BBB-DFE4-43C8-BAB6-3218B23B537A 已收金额 amount_received @@ -13937,7 +13961,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + B06E3B40-4E95-45F4-9494-E51F1BA04B88 未收金额 outstanding_amount @@ -13948,7 +13972,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 2D891728-D38F-4477-8863-4669FA7EE40C 账款状态（1：未支付，2：部分支付，3：已付全款） account_status @@ -13959,7 +13983,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + CF6DEB30-64AA-4D24-8930-88BAB3BB5341 合同约定付款次数 contract_payment_times @@ -13970,7 +13994,7 @@ LABL 0 新宋体,8,N varchar(5) 5 - + CAD6F3FE-D047-4406-A485-479C63F1E86D 是否打包（1：是，0：否） pack @@ -13981,7 +14005,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + AFAFD35A-9A74-42EE-BCF7-B32488CE82DF 打包年份 pack_year @@ -13992,7 +14016,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + C264F307-67F0-45AE-B609-98952F803A5A 合同状态（1：草稿，2：已通过，3：未通过，4：已归档） contract_status @@ -14003,7 +14027,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 3CDDE02A-F95A-41D7-861B-389EB4563E1B 创建人 create_by @@ -14014,7 +14038,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4BA9D173-9934-4B4A-AB4B-552E8C56F3F5 创建时间 create_time @@ -14024,7 +14048,7 @@ LABL 0 新宋体,8,N lilili datetime - + 871858E4-E32A-4F49-80C6-A2E208D7387A 更新人 update_by @@ -14035,7 +14059,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 42AF3DD7-1A55-472E-A2FE-A593757C5DDC 更新时间 update_time @@ -14047,7 +14071,7 @@ LABL 0 新宋体,8,N - + CA926BCA-F893-4F56-A509-956E547B1807 Key_1 Key_1 @@ -14056,12 +14080,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 5EB00612-1162-4B71-8A6D-EF1AA20C37B9 合同编号 spending_contract_no_index @@ -14071,19 +14095,19 @@ LABL 0 新宋体,8,N lilili 合同编号 - + 3994C44A-D841-4027-82D6-07B0734250F5 1629859931 lilili 1630635062 lilili - + - + EDA9AC6C-27B8-491A-ABD1-CB843D939345 合同名称 spending_contract_name_index @@ -14093,21 +14117,21 @@ LABL 0 新宋体,8,N lilili 合同名称 - + 0CFB5CBC-AC18-496E-A82B-1E158EB9035A 1629859946 lilili 1630635062 lilili - + - + @@ -14120,7 +14144,7 @@ LABL 0 新宋体,8,N lilili - + 6A7F3773-E808-4C43-9FA6-3216856E64F4 主键 id @@ -14132,7 +14156,7 @@ LABL 0 新宋体,8,N 32 1 - + 817762D8-8CD0-4054-B7A7-5E5D9706F057 合同id contract_id @@ -14143,7 +14167,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + FA4A2E02-D624-481D-BEFB-951B6B545288 合同状态（2：已通过，3：未通过，4：已归档） contract_status @@ -14154,7 +14178,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 39015FA4-8C78-46D7-B5ED-DA2361FC8642 拒绝说明 explain_remarks @@ -14165,7 +14189,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + EFD29DD5-BA8D-430A-826C-FFF641944AFA 创建人 create_by @@ -14176,7 +14200,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 79F94B71-B088-4022-BC3E-EA4E96AFF108 创建时间 create_time @@ -14186,7 +14210,7 @@ LABL 0 新宋体,8,N lilili datetime - + F21BBE08-9110-45C8-A52B-2C1241C30424 更新人 update_by @@ -14197,7 +14221,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 9DFA188F-28F7-4E7D-8471-8629CA6EE6F5 更新时间 update_time @@ -14209,7 +14233,7 @@ LABL 0 新宋体,8,N - + 292F9D2F-83AF-4385-AB08-809AC5B8E569 Key_1 Key_1 @@ -14218,12 +14242,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -14236,7 +14260,7 @@ LABL 0 新宋体,8,N LQT - + 926D3EFA-92AC-4569-957A-AD0DE2AA25A9 主键 id @@ -14248,7 +14272,7 @@ LABL 0 新宋体,8,N 32 1 - + 5603721A-0C71-45E7-B4FF-BDDA99A2F09A 合同id contract_id @@ -14259,7 +14283,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 86F36C49-1272-420E-946F-AAC0E66A43F2 项目id project_id @@ -14270,7 +14294,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 29654BA7-486E-42C3-AE64-D5A51CCDF93D 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目） project_type @@ -14281,7 +14305,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + FF2B7CF8-B7C5-47DD-969E-30E694E4EB19 创建人 create_by @@ -14292,7 +14316,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F62B763E-A24A-4352-9BC3-F4A7D09F8DF6 创建时间 create_time @@ -14302,7 +14326,7 @@ LABL 0 新宋体,8,N lilili datetime - + BECC702C-B361-4F1D-8654-4130F7E91DB1 更新人 update_by @@ -14313,7 +14337,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F6D4D336-06AE-42A8-9848-B286A2A0F2CB 更新时间 update_time @@ -14325,7 +14349,7 @@ LABL 0 新宋体,8,N - + B65E082F-0E27-4187-9A8F-D026DC9710E1 Key_1 Key_1 @@ -14334,12 +14358,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -14352,7 +14376,7 @@ LABL 0 新宋体,8,N LQT - + 3E191DD2-E4A1-4DC9-9B16-06BBAEA00FA9 主键 id @@ -14364,7 +14388,7 @@ LABL 0 新宋体,8,N 32 1 - + 08EB6B8B-34B4-444D-AF88-F3F995935C3E 合同id contract_id @@ -14375,7 +14399,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A78536D5-34EB-42AC-BE20-DFB6E20FAC1D 阶段名称 phase_name @@ -14386,7 +14410,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 01902CB7-0320-4ECE-88D9-A12580923E35 应收金额 accounts_receivable_amount @@ -14397,7 +14421,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 33C4941B-9D64-4B40-AB13-8815FCC4D3DE 应收时间 accounts_receivable_time @@ -14407,7 +14431,7 @@ LABL 0 新宋体,8,N LQT date - + 94BCB4AD-8947-45ED-B9D9-21A528B1C323 实收金额 paid_amount @@ -14418,7 +14442,7 @@ LABL 0 新宋体,8,N int(11) 11 - + BEA9FB1A-3326-4271-904C-0BAC630F55C7 实收时间 paid_time @@ -14428,7 +14452,7 @@ LABL 0 新宋体,8,N LQT date - + 592EADCA-DD09-4735-96D4-F5230E54AF6F 创建人 create_by @@ -14439,7 +14463,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 61FA60A0-E3EE-44E4-AE1E-47656D1E8007 创建时间 create_time @@ -14449,7 +14473,7 @@ LABL 0 新宋体,8,N lilili datetime - + A1733E29-5B90-40E8-9133-F2EF83B098BE 更新人 update_by @@ -14460,7 +14484,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 157CDFEA-B1EB-4770-8C7C-4C6A960E4E5D 更新时间 update_time @@ -14472,7 +14496,7 @@ LABL 0 新宋体,8,N - + 4DE750D1-E371-42A4-8D8D-F2D4CD1FE8CF Key_1 Key_1 @@ -14481,12 +14505,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -14499,7 +14523,7 @@ LABL 0 新宋体,8,N LQT - + A02B8DCB-041B-4276-B775-443BCEE30A70 主键 id @@ -14511,7 +14535,7 @@ LABL 0 新宋体,8,N 32 1 - + DD718668-44B8-4AE4-86F7-3D7DA57420C9 合同编号 contract_num @@ -14522,7 +14546,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 30471CE0-84C2-4D55-85E4-9C6561D0DE7D 合同名称 contract_name @@ -14533,7 +14557,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 1C1304EA-318E-4C02-8418-DEF8863DAB21 签订单位id signed_company_id @@ -14544,7 +14568,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7F60F449-32B7-487C-BCC0-1F97DF6754B0 临时签订单位id signed_company_temporary_id @@ -14555,7 +14579,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0D50B5A5-E0F7-4C4F-BF8E-E688BA775F56 临时签订单位名称 signed_company_temporary_name @@ -14566,7 +14590,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A04A53E1-E74F-47B0-BA53-4D4174547551 签订单位联系人id signed_contacts_id @@ -14577,7 +14601,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EC27B57C-FC48-4AF1-ADDC-E046F1D31D8B 临时签订单位联系人id signed_contacts_temporary_id @@ -14588,7 +14612,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7BB2FBEC-3536-486F-BD77-AD0E59528846 临时签订单位联系人名称 signed_contacts_temporary_name @@ -14599,7 +14623,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + B16004D9-4D8F-4E31-B26C-2DB8DBF366CF 是否开口（1：是，0：否） opening @@ -14610,7 +14634,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 0713E854-A125-464F-8D88-497BCFBF5D1A 负责人id principal_id @@ -14621,7 +14645,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0694D206-FD93-4B5F-B391-19CC55E669A2 负责人名称 principal_name @@ -14632,7 +14656,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + BD06D730-2989-4CF0-8CD9-2E550648B10E 部门名称 department_name @@ -14643,7 +14667,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + F254FF04-0F5C-48AB-AB32-F62A7ABBF40E 签订合同金额 contract_amount @@ -14654,7 +14678,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 9DB8D53D-263A-4200-9D09-D23C0633EA4F 税率 rate @@ -14665,7 +14689,7 @@ LABL 0 新宋体,8,N varchar(3) 3 - + 26F1E531-7084-4914-BFFD-BCDDF76A9C50 未税金额 no_tax_amount @@ -14676,7 +14700,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + A402EF96-CD07-4926-9C1B-AECF18E22851 合同签订日期 contract_date @@ -14686,7 +14710,7 @@ LABL 0 新宋体,8,N lilili date - + 76546AAA-A161-4460-94A6-F08761A889FB 合同终止日期 termination_date @@ -14696,7 +14720,7 @@ LABL 0 新宋体,8,N lilili date - + 0DD4043F-DAAB-4271-8C44-D491F934D88C 合同约定主要时点 contract_time_points @@ -14707,7 +14731,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + EBBE42FE-E8DE-469F-8566-2ED303010743 应收金额 accounts_receivable_amount @@ -14718,7 +14742,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 8603913A-2435-464B-A5B1-0F6D22289EDA 已收金额 amount_received @@ -14729,7 +14753,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + C2DF3D8C-6B21-4248-B84B-59EE1E519FCA 未收金额 outstanding_amount @@ -14740,7 +14764,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 04E5FCDF-5BB2-464A-912B-0B096F356DD7 账款状态（1：未支付，2：部分支付，3：已付全款） account_status @@ -14751,7 +14775,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 08F5F32E-3588-4CD3-90E6-94B6234CC52E 合同约定付款次数 contract_payment_times @@ -14762,7 +14786,7 @@ LABL 0 新宋体,8,N varchar(5) 5 - + 352492AA-01E8-4784-AE9E-8A80F2C07348 是否打包（1：是，0：否） pack @@ -14773,7 +14797,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + CD4F9F58-573E-450D-8248-21B36FDA2DA5 打包年份 pack_year @@ -14784,7 +14808,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + 094120DB-001D-4623-8B77-9F88F80E3102 合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档） status @@ -14795,7 +14819,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 7FD275A4-B536-42A2-91F6-51257BCFE186 创建人 create_by @@ -14806,7 +14830,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 98F94E35-73C7-4D68-B696-8A8DAF66E73F 创建时间 create_time @@ -14816,7 +14840,7 @@ LABL 0 新宋体,8,N lilili datetime - + C2B63E5F-AEAB-45B5-9409-7D30EA722F8C 更新人 update_by @@ -14827,7 +14851,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 73A398F7-12E3-41AD-9E72-A23AC0BDA3C2 更新时间 update_time @@ -14839,7 +14863,7 @@ LABL 0 新宋体,8,N - + 669F8D3C-DF0C-46BB-99B3-05411D4FF0F2 Key_1 Key_1 @@ -14848,12 +14872,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 3614C008-C528-4460-B7C6-7A739F04E408 合同编号 income_contract_no_index @@ -14863,19 +14887,19 @@ LABL 0 新宋体,8,N lilili 合同编号 - + 2EE658E4-384B-41B6-9DB0-169887D8FFB6 1629854544 lilili 1630635062 lilili - + - + F30F270B-5761-493F-9650-13F9CED0FC72 合同名称 income_contract_name_index @@ -14885,21 +14909,21 @@ LABL 0 新宋体,8,N lilili 合同名称 - + 94CAD0BF-08A3-4F81-8CC8-112690281FE2 1629854598 lilili 1630635062 lilili - + - + @@ -14913,7 +14937,7 @@ LABL 0 新宋体,8,N 联系人管理临时表 - + 34445793-4870-4ABF-AE5D-0C191587E081 主键 id @@ -14925,7 +14949,7 @@ LABL 0 新宋体,8,N 32 1 - + F3678230-BD3D-476D-93B1-6F369E88618A 企业id company_id @@ -14936,7 +14960,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 95F46437-7EC5-4EDE-94BE-72A35CC9D512 企业名称 company_name @@ -14947,7 +14971,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + B4B234A8-7BE2-43E5-B5DB-C4D1E276D56E 姓名 name @@ -14958,7 +14982,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + A192942F-5F37-4421-B1E3-844E1AAEEFC5 性别（1：男，2：女） gender @@ -14969,7 +14993,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + EF7E7C6C-DDF5-4214-B23A-175F5006EDCB 职务 post @@ -14980,7 +15004,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 75CE318E-04B5-4A2B-9BD0-2936FA7D229E 手机号 phone @@ -14991,7 +15015,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 3593EB75-66DE-4B7F-830A-F2B27B0CB1DC 邮箱 email @@ -15002,7 +15026,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 141502C7-1FE0-4EC9-93B2-94BE39DD0999 通讯地址 contact_address @@ -15013,7 +15037,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 0A733192-4274-40CD-BD10-0B6AAD5C4F3B 邮政编码 postal_code @@ -15024,7 +15048,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + 818805FF-80D4-44CB-AF92-B286B46C1913 数据来源(1：管理端，2：报名) data_source @@ -15035,7 +15059,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + FEE1143F-EDB4-4010-943C-72FC577B90B3 报名新增（1：是，0：否） signing_up @@ -15046,7 +15070,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 24862780-EF34-4607-8190-6094D056B381 备注 remarks @@ -15057,7 +15081,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 6FA0793D-EAC0-4F1A-9AC1-05849215D4B5 创建人 create_by @@ -15068,7 +15092,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 51445942-D04D-4857-B5EC-9C20BB7CA9D5 创建时间 create_time @@ -15078,7 +15102,7 @@ LABL 0 新宋体,8,N lilili datetime - + CD262609-3EC5-4DB8-ABF9-235CEB11E0D4 更新人 update_by @@ -15089,7 +15113,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8FAD0195-14F9-493A-BB33-7D60A44709B3 更新时间 update_time @@ -15101,7 +15125,7 @@ LABL 0 新宋体,8,N - + 289DCD0F-5060-4197-B2C5-D635D1BA72BE Key_1 Key_1 @@ -15110,12 +15134,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 5D2EA952-48A1-4003-9C5C-A9C14DAA5983 企业名称 contacts_company_name_index @@ -15125,19 +15149,19 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 9660727D-BC83-4721-837D-17B4ABDF4464 1629853614 lilili 1630635062 lilili - + - + 617248A5-D5E4-4B04-9F2B-240152791DEE 姓名 contacts_name_index @@ -15147,19 +15171,19 @@ LABL 0 新宋体,8,N lilili 姓名 - + 5DA4F19C-08D5-4AFE-A4DA-0A2AF0AF7708 1629853656 lilili 1630635062 lilili - + - + 22635D0B-1F75-4C65-9E9A-DC0CE1F681E2 手机号 contacts_phone_index @@ -15169,21 +15193,21 @@ LABL 0 新宋体,8,N lilili 手机号 - + 7C242518-6C3E-4A3A-B50B-719B8E9B415D 1629854483 lilili 1630635062 lilili - + - + @@ -15197,7 +15221,7 @@ LABL 0 新宋体,8,N 企业管理临时表 - + B2FE3135-A7C4-4531-B912-AAE9A850464F 主键 id @@ -15209,7 +15233,7 @@ LABL 0 新宋体,8,N 32 1 - + D8433323-BA3A-48A1-A312-98994789BA6E 企业名称 company_name @@ -15220,7 +15244,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E81D3858-0B38-4868-A933-3B721FCC6BB8 公司地址 company_address @@ -15231,7 +15255,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 1FC5AE02-DA3D-4E37-A5CB-9E20FD4D3A46 公司电话 company_phone @@ -15242,7 +15266,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 29A2564C-CFD6-47D3-845B-6B624E31040D 邮编 postal_code @@ -15253,7 +15277,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + 2615950E-236A-4006-8715-545C9FBC6521 银行户名 bank_account_name @@ -15264,7 +15288,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E8D0C1F0-B754-4BF3-BFDD-022795B25BEA 开户行 opening_bank @@ -15275,7 +15299,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + ADE43F63-CA98-48B5-ABF7-2D16747D09EA 银行账号 bank_account @@ -15286,7 +15310,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + DAF30B41-EADF-4BA8-A3AE-C6A18374D0C5 税号 duty_code @@ -15297,7 +15321,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + D4174A18-41AF-4335-B0B3-AD225079D17B 数据来源(1：管理端，2：报名) data_source @@ -15308,7 +15332,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 58BAF47A-42F1-4516-AF35-9CBF7E8DE3D3 报名新增（1：是，0：否） signing_up @@ -15319,7 +15343,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 68653960-84F7-46C5-B911-FF5F5B1F7E4F 备注 remarks @@ -15330,7 +15354,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 9405D526-14CA-4EDA-BEB5-96EF1466EA86 创建人 create_by @@ -15341,7 +15365,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D4FB9A98-9A72-4A5A-B8A2-7439A4E0827B 创建时间 create_time @@ -15351,7 +15375,7 @@ LABL 0 新宋体,8,N lilili datetime - + FAEA725E-102E-4C04-8B35-CE4F2F8C7EBB 更新人 update_by @@ -15362,7 +15386,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1CFD7D8F-2D96-4B2F-9114-A1C602F8AA60 更新时间 update_time @@ -15374,7 +15398,7 @@ LABL 0 新宋体,8,N - + 3D5694FA-CDC5-4FDF-BC98-2C9591E8CD27 Key_1 Key_1 @@ -15383,12 +15407,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 67102A18-F9A5-414F-89FC-7AEDA6251688 企业名称 company_name_index @@ -15398,21 +15422,21 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 0DBE570E-5726-42B2-8F2F-1CE18AA9616E 1629852781 lilili 1630635062 lilili - + - + @@ -15425,7 +15449,7 @@ LABL 0 新宋体,8,N lilili - + 1501DAA3-D8B6-4178-AF91-FB33CB666BCE 主键 id @@ -15437,7 +15461,7 @@ LABL 0 新宋体,8,N 32 1 - + AADFD507-2374-4006-A893-DAB26CBF0792 企业id company_id @@ -15448,7 +15472,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 79EFEA2B-032A-4758-A4D6-54577B97E983 企业名称 company_name @@ -15459,7 +15483,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + D314E871-4E31-4725-808A-86E609BD39F2 姓名 name @@ -15470,7 +15494,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 099FCABD-A4A6-4B22-877B-5BF3905EE706 性别（1：男，2：女） gender @@ -15481,7 +15505,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + CB6A13B6-2377-4EF3-908D-52C97CE04672 职务 post @@ -15492,7 +15516,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 44311CEB-FADF-4024-827B-8D61825361BD 手机号 phone @@ -15503,7 +15527,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A6120E79-82E7-4354-A934-4BB168026D4E 邮箱 email @@ -15514,7 +15538,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A3098728-9995-4C52-83ED-EA097A6B88D9 通讯地址 contact_address @@ -15525,7 +15549,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + BD682759-BB92-4F0D-9C1E-6D4E5FD5DA5D 邮政编码 postal_code @@ -15536,7 +15560,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + F35C58C4-6B72-4842-90E5-8D4B6ABC9376 数据来源(1：管理端，2：报名) data_source @@ -15547,7 +15571,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 5AB11854-9385-4DA0-A032-92487922DDD1 报名新增（1：是，0：否） signing_up @@ -15558,7 +15582,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 61F4A6FE-B7E8-4363-ACC1-EAA64C7DD56B 备注 remarks @@ -15569,7 +15593,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 95BC51F1-C344-49B8-95FE-9B60AE8E56D2 创建人 create_by @@ -15580,7 +15604,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 6DCF7930-B5DF-4BDF-8AE1-88FBBA4A71A3 创建时间 create_time @@ -15590,7 +15614,7 @@ LABL 0 新宋体,8,N lilili datetime - + 459D2158-B942-415D-98EE-E8125DE29D42 更新人 update_by @@ -15601,7 +15625,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CF38F24E-95E4-40D2-B920-7EFC00A18291 更新时间 update_time @@ -15613,7 +15637,7 @@ LABL 0 新宋体,8,N - + DAB99C9E-BF59-4552-A138-749242509771 Key_1 Key_1 @@ -15622,12 +15646,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + ED73FB1B-5674-4AC7-A20D-5B84EED9179D 企业名称 contacts_company_name_index @@ -15637,19 +15661,19 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 1403EEEC-DC59-4205-9F74-47F70F4F3B16 1629853614 lilili 1630635062 lilili - + - + C875FC05-F7D8-4EEE-A40F-5A07684B522E 姓名 contacts_name_index @@ -15659,19 +15683,19 @@ LABL 0 新宋体,8,N lilili 姓名 - + 1787A682-0632-4D74-BDAC-FA58187BBBEC 1629853656 lilili 1630635062 lilili - + - + 096C9303-97B8-4142-9A19-CC90B0FECBBC 手机号 contacts_phone_index @@ -15681,21 +15705,21 @@ LABL 0 新宋体,8,N lilili 手机号 - + D77F0998-7E47-4CCF-A5D2-F61175BA1A55 1629854483 lilili 1630635062 lilili - + - + @@ -15709,7 +15733,7 @@ LABL 0 新宋体,8,N 企业管理 - + E4F45814-2EA1-49EE-9333-44343C0F49E5 主键 id @@ -15721,7 +15745,7 @@ LABL 0 新宋体,8,N 32 1 - + C69BE155-C773-41F1-B028-B69798A49006 企业名称 company_name @@ -15732,7 +15756,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 0D4BEEDC-DA5C-43B4-B663-452F127F3799 公司地址 company_address @@ -15743,7 +15767,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D0E99A77-4168-415C-B8C5-3CA6690BDDBE 公司电话 company_phone @@ -15754,7 +15778,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + FC79E7B6-DC18-466C-9119-31A877D69ACD 邮编 postal_code @@ -15765,7 +15789,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + 1E6E1A91-508E-4579-97D6-4F833237D260 银行户名 bank_account_name @@ -15776,7 +15800,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 04C75FEE-F54E-4262-ACCA-C3EC4A020CFB 开户行 opening_bank @@ -15787,7 +15811,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A4DE19EB-5ABE-429C-991F-6152912C74BA 银行账号 bank_account @@ -15798,7 +15822,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6A76FC34-6E63-4A36-AA08-796B4D2DEFD9 税号 duty_code @@ -15809,7 +15833,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 57FF0A5D-0DB9-4C62-A09C-358E762CFB7D 数据来源(1：管理端，2：报名) data_source @@ -15820,7 +15844,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 6C27C1A6-D1E1-4C2A-B2DC-43A70A1ACBF1 报名新增（1：是，0：否） signing_up @@ -15831,7 +15855,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + B904B345-FCF6-48A2-8122-49EFC727CA42 备注 remarks @@ -15842,7 +15866,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 8BC8B736-EEB4-4C47-BB70-97B5DB649AEB 创建人 create_by @@ -15853,7 +15877,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 13F6067A-9E37-4D0D-9AA0-050BE1971026 创建时间 create_time @@ -15863,7 +15887,7 @@ LABL 0 新宋体,8,N lilili datetime - + 03DF5D33-EAB4-4040-BE2D-2FC40100D77E 更新人 update_by @@ -15874,7 +15898,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 337CDE3E-B9B4-4C63-AF0C-28EA99202D61 更新时间 update_time @@ -15886,7 +15910,7 @@ LABL 0 新宋体,8,N - + 1C236921-A5A8-454E-828A-852A3E6A961D Key_1 Key_1 @@ -15895,12 +15919,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 5A5226CB-E23C-4E4B-8FF9-4DAF8A1F618F 企业名称 company_name_index @@ -15910,26 +15934,26 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 047E4CCD-9D6C-48E0-96ED-32A104EB4788 1629852781 lilili 1630635062 lilili - + - + - + DF30943D-F7AB-4FE7-8EDF-47FAAD7F38A3 PUBLIC PUBLIC @@ -16020,18 +16044,18 @@ LABL 0 新宋体,8,N - + 83F81B76-D862-44FC-AD9D-F174C91D40F8 MySQL 5.0 MYSQL50 1629683729 LQT -1630841542 -LQT +1631003921 +lilili file:///%_DBMS%/mysql50.xdb F4F16ECD-F2F1-4006-AF6F-638D5C65F35E 4BA9F647-DAB1-11D1-9944-006097355D9B -1629858954 +1276524678 From e4ee78e4b1b79859ee0fe2eddac66ff157201a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 16:52:58 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 9 ++- .../PaySpendingContractController.java | 6 +- ...SpendingContractInstallmentController.java | 22 +++--- .../entity/PayIncomeContractAssociated.java | 8 ++ .../entity/PayIncomeContractAudit.java | 8 ++ .../entity/PayIncomeContractInstallment.java | 7 ++ .../PaySpendingContractInstallment.java | 7 ++ .../mapper/xml/PayIncomeContractMapper.xml | 77 +++++++++++-------- .../impl/PayIncomeContractServiceImpl.java | 20 +++-- .../contract/vo/PayIncomeContractOutput.java | 7 ++ .../controller/PayWorkingGroupController.java | 18 +++++ .../project/mapper/PayWorkingGroupMapper.java | 10 +++ .../mapper/xml/PayWorkingGroupMapper.xml | 26 +++++++ .../service/IPayWorkingGroupService.java | 9 +++ .../impl/PayWorkingGroupServiceImpl.java | 5 ++ 15 files changed, 179 insertions(+), 60 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index cb8b51b6..15a70092 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -103,9 +103,12 @@ public class PayIncomeContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); - pageList.getRecords().forEach(p->{ - System.out.println(JSONObject.toJSONString(p)); - }); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + + }); + } return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 98b12411..d055c01e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -79,7 +79,7 @@ public class PaySpendingContractController extends JeroController edit(@RequestBody PaySpendingContract paySpendingContract) { paySpendingContractService.updateById(paySpendingContract); return Result.OK("编辑成功!"); @@ -93,7 +93,7 @@ public class PaySpendingContractController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractService.removeById(id); return Result.OK("删除成功!"); @@ -107,7 +107,7 @@ public class PaySpendingContractController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java index 612ec817..23eae046 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java @@ -17,8 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; /** * @Description: pay_spending_contract_installment @@ -26,7 +24,7 @@ import io.swagger.annotations.ApiOperation; * @Date: 2021-09-07 * @Version: V1.0 */ -@Api(tags="pay_spending_contract_installment") +//@Api(tags="pay_spending_contract_installment") @RestController @RequestMapping("/contract/paySpendingContractInstallment") @Slf4j @@ -44,7 +42,7 @@ public class PaySpendingContractInstallmentController extends JeroController queryPageList(PaySpendingContractInstallment paySpendingContractInstallment, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -63,7 +61,7 @@ public class PaySpendingContractInstallmentController extends JeroController add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { paySpendingContractInstallmentService.save(paySpendingContractInstallment); @@ -77,8 +75,8 @@ public class PaySpendingContractInstallmentController extends JeroController edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) { paySpendingContractInstallmentService.updateById(paySpendingContractInstallment); return Result.OK("编辑成功!"); @@ -91,8 +89,8 @@ public class PaySpendingContractInstallmentController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractInstallmentService.removeById(id); return Result.OK("删除成功!"); @@ -105,8 +103,8 @@ public class PaySpendingContractInstallmentController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractInstallmentService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); @@ -119,7 +117,7 @@ public class PaySpendingContractInstallmentController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PaySpendingContractInstallment paySpendingContractInstallment = paySpendingContractInstallmentService.getById(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java index d9d56bdb..ccae0538 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAssociated.java @@ -13,6 +13,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + /** * @Description: pay_income_contract_associated * @Author: jeecg-boot @@ -34,14 +38,18 @@ public class PayIncomeContractAssociated implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private java.lang.String contractId; /**项目id*/ @Excel(name = "项目id", width = 15) @ApiModelProperty(value = "项目id") + @Size(max = 32, message = "项目id长度不能大于32个字符") private java.lang.String projectId; /**项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）*/ @Excel(name = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）", width = 15) @ApiModelProperty(value = "项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）") + @Max(5) + @Min(1) private java.lang.Integer projectType; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java index 7137846b..3352a671 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractAudit.java @@ -14,6 +14,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + /** * @Description: pay_income_contract_audit * @Author: jeecg-boot @@ -35,15 +39,19 @@ public class PayIncomeContractAudit implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private java.lang.String contractId; /**合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）*/ @Excel(name = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）", width = 15) @ApiModelProperty(value = "合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档）") @Dict(dicCode = "revenue_contract_status") + @Max(5) + @Min(1) private java.lang.Integer contractStatus; /**拒绝说明*/ @Excel(name = "拒绝说明", width = 15) @ApiModelProperty(value = "拒绝说明") + @Size(max = 200, message = "拒绝说明长度不能大于200个字符") private java.lang.String explainRemarks; /**创建人*/ @ApiModelProperty(value = "创建人") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java index 16215228..6b2b2cc3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java @@ -13,6 +13,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Size; + /** * @Description: pay_income_contract_installment * @Author: jeecg-boot @@ -34,14 +37,17 @@ public class PayIncomeContractInstallment implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private java.lang.String contractId; /**阶段*/ @Excel(name = "阶段", width = 15) @ApiModelProperty(value = "阶段") + @Size(max = 50, message = "阶段长度不能大于50个字符") private java.lang.String phaseName; /**应收金额*/ @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") + @Max(value = 999999999,message = "应收金额格式错误") private java.lang.Integer accountsReceivableAmount; /**应收时间*/ @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") @@ -52,6 +58,7 @@ public class PayIncomeContractInstallment implements Serializable { /**实收金额*/ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") + @Max(value = 999999999,message = "实收金额格式错误") private java.lang.Integer paidAmount; /**实收时间*/ @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java index 526c4ac3..a7f85823 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContractInstallment.java @@ -14,6 +14,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.Size; + /** * @Description: pay_spending_contract_installment * @Author: jeecg-boot @@ -35,14 +38,17 @@ public class PaySpendingContractInstallment implements Serializable { /**合同id*/ @Excel(name = "合同id", width = 15) @ApiModelProperty(value = "合同id") + @Size(max = 32, message = "合同id长度不能大于32个字符") private String contractId; /**阶段名称*/ @Excel(name = "阶段名称", width = 15) @ApiModelProperty(value = "阶段名称") + @Size(max = 50, message = "阶段名称长度不能大于50个字符") private String phaseName; /**应收金额*/ @Excel(name = "应收金额", width = 15) @ApiModelProperty(value = "应收金额") + @Max(value = 999999999,message = "应收金额格式错误") private Integer accountsReceivableAmount; /**应收时间*/ @Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd") @@ -53,6 +59,7 @@ public class PaySpendingContractInstallment implements Serializable { /**实收金额*/ @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") + @Max(value = 999999999,message = "应收金额格式错误") private Integer paidAmount; /**实收时间*/ @Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index fb04ad27..7406dd95 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -3,13 +3,15 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index a782c215..4ababf7c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -33,4 +33,13 @@ public interface IPayWorkingGroupService extends IService { * @Exception */ List queryListByCompany(String companyId,String workingGroupProject,String year,String projectType); + /** + * @Description 查询不存在成员单位的列表 + * @Author lqt + * @Date 2021/9/7 + * @Param + * @Return + * @Exception + */ + List queryListByNotCompany(String companyId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 257610cd..878a679e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -34,4 +34,9 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl queryListByCompany(String companyId,String workingGroupProject, String year,String projectType) { return payWorkingGroupMapper.queryListByCompany(companyId,workingGroupProject,year,projectType); } + + @Override + public List queryListByNotCompany(String companyId) { + return payWorkingGroupMapper.queryListByNotCompany(companyId); + } } From 577a605f5c649f6bbabb239e52a885f472f16660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 7 Sep 2021 17:32:44 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C-?= =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 5 +- .../PaySpendingContractController.java | 64 ++++++++++++------- .../mapper/xml/PayIncomeContractMapper.xml | 38 ++++++----- 3 files changed, 61 insertions(+), 46 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 15a70092..c75d93fa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -97,9 +97,6 @@ public class PayIncomeContractController extends JeroController 50){ return Result.error("合同名称长度不能大于50个字符!"); } - if(!StringUtils.isBlank(projectName) && projectName.length() > 50){ - return Result.error("关联项目长度不能大于50个字符!"); - } // todo 缺少会议，会员项目，标协会员 Page page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); @@ -377,6 +374,8 @@ public class PayIncomeContractController extends JeroController{ String str = JSON.toJSONString(p); Map map = JSONObject.parseObject(str,Map.class); + map.put("contractDate",DateUtils.date2Str(p.getContractDate(),new SimpleDateFormat("yyyy-MM-dd"))); + map.put("terminationDate",DateUtils.date2Str(p.getTerminationDate(),new SimpleDateFormat("yyyy-MM-dd"))); map.put("opening",sysBaseAPI.translateDict("yn",String.valueOf(p.getOpening()))); map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus()))); map.put("pack",sysBaseAPI.translateDict("yn",String.valueOf(p.getPack()))); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index d055c01e..eea95784 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -1,6 +1,7 @@ package com.jero.contract.controller; import java.util.Arrays; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -12,9 +13,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PaySpendingContract; import com.jero.contract.service.IPaySpendingContractService; +import com.jero.contract.vo.PayIncomeContractOutput; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -22,12 +27,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: pay_spending_contract + * @Description: 支出合同 * @Author: jeecg-boot * @Date: 2021-09-07 * @Version: V1.0 */ -@Api(tags="pay_spending_contract") +@Api(tags="支出合同") @RestController @RequestMapping("/contract/paySpendingContract") @Slf4j @@ -38,23 +43,36 @@ public class PaySpendingContractController extends JeroController queryPageList(PaySpendingContract paySpendingContract, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paySpendingContract, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = paySpendingContractService.page(page, queryWrapper); - return Result.OK(pageList); + @RequestParam(name="startTime",required = false) String startTime, + @RequestParam(name="endTime",required = false) String endTime) { + if(!StringUtils.isBlank(paySpendingContract.getContractNum()) && paySpendingContract.getContractNum().length() > 50){ + return Result.error("合同编号长度不能大于50个字符!"); + } + if(!StringUtils.isBlank(paySpendingContract.getContractName()) && paySpendingContract.getContractName().length() > 50){ + return Result.error("合同名称长度不能大于50个字符!"); + } +// Page page = new Page<>(pageNo, pageSize); +// IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); +// if(!CollectionUtils.isEmpty(pageList.getRecords())){ +// List list = pageList.getRecords(); +// list.forEach(p->{ +// +// }); +// } + return Result.OK(null); } /** @@ -63,8 +81,8 @@ public class PaySpendingContractController extends JeroController add(@RequestBody PaySpendingContract paySpendingContract) { paySpendingContractService.save(paySpendingContract); @@ -77,8 +95,8 @@ public class PaySpendingContractController extends JeroController edit(@RequestBody PaySpendingContract paySpendingContract) { paySpendingContractService.updateById(paySpendingContract); @@ -91,8 +109,8 @@ public class PaySpendingContractController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paySpendingContractService.removeById(id); @@ -105,8 +123,8 @@ public class PaySpendingContractController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paySpendingContractService.removeByIds(Arrays.asList(ids.split(","))); @@ -119,8 +137,8 @@ public class PaySpendingContractController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PaySpendingContract paySpendingContract = paySpendingContractService.getById(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 7406dd95..94890de4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -55,29 +55,27 @@ left join pay_working_group pwg ON pwg.id = pwgs.working_group_id WHERE pwg.working_group_project is not null and pwg.working_group_project!='' ) project ON project.id = pica.project_id - - - AND pic.contract_num LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractNum},'%')) - - - AND pic.contract_name LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%')) - - - AND pic.create_time >= #{startTime} - - - AND pic.create_time <= #{endTime} - - - AND pic.status = #{payIncomeContract.status} - - - AND pic.chargeStatus = #{chargeStatus} - - GROUP BY pic.id ) aa + + AND aa.contractNum LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractNum},'%')) + + + AND aa.contractName LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%')) + + + AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') >= #{startTime} + + + AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') <= #{endTime} + + + AND aa.status = #{payIncomeContract.status} + + + AND aa.chargeStatus = #{chargeStatus} + AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%')) From 1356669cea1cc8f65c95979ba1b61d4c3d08a553 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 7 Sep 2021 17:42:04 +0800 Subject: [PATCH 10/11] =?UTF-8?q?update=20pdm=20=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E4=BA=BA=E8=A1=A8=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/pay.pdm | 1400 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 881 insertions(+), 519 deletions(-) diff --git a/db/pay.pdm b/db/pay.pdm index 5a452781..9b155168 100644 --- a/db/pay.pdm +++ b/db/pay.pdm @@ -1,5 +1,5 @@ - + @@ -5190,8 +5190,8 @@ Shadow=0 1629862221 1630635158 -((914,8233), (8801,9633)) -((1314,8933),(8401,8933)) +((914,8198), (7451,9598)) +((1314,8898),(7051,8898)) 1 8 16744576 @@ -5256,7 +5256,7 @@ LABL 0 新宋体,8,N 1629862221 1630635157 -1 -((8401,852), (29592,17124)) +((7051,-11111), (30945,29087)) 12615680 16570034 12632256 @@ -6284,7 +6284,7 @@ LABL 0 新宋体,8,N 1629948780 1630398373 -1 -((-7314,1051), (10014,9899)) +((-20252,226), (22952,10724)) 12615680 16570034 12632256 @@ -10725,7 +10725,7 @@ LABL 0 新宋体,8,N pay_meeting_situation 1629857873 lilili -1629862369 +1631007457 lilili 会议报名表 @@ -10826,18 +10826,66 @@ LABL 0 新宋体,8,N 50 -6420F129-FE0A-4B8D-8B78-998E4AAFF7E8 -姓名 -user_name -1629857873 +18733A7E-A7FA-488B-90DE-5FB6F6FB5D5A +企业联系人id +company_contact_id +1631004651 lilili -1629862221 +1631004957 lilili -姓名 +企业联系人id varchar(50) 50 +6420F129-FE0A-4B8D-8B78-998E4AAFF7E8 +企业联系人姓名 +company_contact_name +1629857873 +lilili +1631004957 +lilili +企业联系人姓名 +varchar(50) +50 + + +6E923993-8EBF-4D82-9C9B-59D3B71447EA +职务 +post +1631005042 +lilili +1631006036 +lilili +职务 +varchar(50) +50 + + +C139644F-3244-4BC5-982D-9B65A412B5E9 +手机号 +phone +1629857873 +lilili +1631006036 +lilili +手机号 +varchar(150) +150 + + +3B2DA66B-3B03-4793-96A3-A03D6BD9F5D7 +邮箱 +email +1631005042 +lilili +1631006036 +lilili +邮箱 +varchar(150) +150 + + AB61178B-211A-450A-B57D-0C199AD0F385 身份 identity @@ -10849,19 +10897,91 @@ LABL 0 新宋体,8,N int(2) 2 - -C139644F-3244-4BC5-982D-9B65A412B5E9 -手机号 -phone -1629857873 + +95A04F76-A680-4A63-A26B-393E46BD5235 +嘉宾类型 +guest_type +1631006045 lilili -1629862221 +1631006351 lilili -手机号 +嘉宾类型 +int(2) +2 + + +2A8EFFC9-9186-4C30-8F9D-E0617282ED8D +演讲题目 +speech_topic +1631006045 +lilili +1631006351 +lilili +演讲题目 varchar(50) 50 - + +60F162BF-DF0A-4E4D-85BF-DCAE940D3CA9 +演讲ppt +speech_ppt +1631006045 +lilili +1631006351 +lilili +演讲ppt +varchar(50) +50 + + +90FA4BBF-15E4-4CAE-9DCC-52F82DBE4008 +照片 +photo +1631006045 +lilili +1631006351 +lilili +照片 +varchar(50) +50 + + +1C9CDAA2-4464-4D26-AC1C-1BE192D687F3 +个人简介 +profile +1631006045 +lilili +1631006351 +lilili +个人简介 +varchar(50) +50 + + +AD0E5DFE-AF00-492A-B50E-0B86F1E4BC93 +是否用餐 +have_meals +1631006045 +lilili +1631006351 +lilili +是否用餐 +int(2) +2 + + +29BBEF6F-D8DB-4851-9A29-287109342927 +是否回民 +hui_people +1631006352 +lilili +1631006784 +lilili +是否回民 +int(2) +2 + + 10527EC0-85F1-41ED-9824-D49C74F466AA 是否入住协议酒店 check_in_hotel @@ -10873,29 +10993,195 @@ LABL 0 新宋体,8,N int(2) 2 - + C80C14FC-596A-479C-A670-636CF1CEC425 -抵达时间 -arrival_time +入住酒店时间 +in_hotel_time 1629857873 lilili -1629862221 +1631006784 +lilili +入住酒店时间 +datetime + + +07AE0506-0F74-4D54-BA0F-74C3FDCC9A25 +离开酒店时间 +out_hotel_time +1629857873 +lilili +1631006784 +lilili +离开酒店时间 +datetime + + +FEF36225-1148-4F1A-9304-2E1E55FA7F55 +房型 +room_layout +1631006352 +lilili +1631007457 +lilili +房型 +varchar(50) +50 + + +AC796DB3-F39F-4EE3-BB71-9F8040494ECF +抵达时间 +arrival_time +1631006788 +lilili +1631007457 lilili 抵达时间 datetime - -07AE0506-0F74-4D54-BA0F-74C3FDCC9A25 -离开时间 -leave_time -1629857873 + +7FD47936-2DF9-437F-914C-279A1151DE37 +到达站 +destination +1631006788 lilili -1629862221 +1631007457 +lilili +到达站 +varchar(50) +50 + + +7E0257AF-74CB-4320-A79D-F6D928791020 +到达班次 +arrival_shift +1631006788 +lilili +1631007457 +lilili +到达班次 +varchar(50) +50 + + +2AC755CA-5297-47A9-9C1F-013D54EFB9ED +是否需要送站 +delivery_station +1631006788 +lilili +1631007457 +lilili +是否需要送站 +int(2) +2 + + +3675ECF4-716F-4E83-ADCC-09FA88CAAB6C +离开时间 +departure_time +1631006788 +lilili +1631007457 lilili 离开时间 datetime - + +956CCB04-0742-4128-8B22-79CDC3BEAC5D +离开站 +departure_station +1631006788 +lilili +1631007457 +lilili +离开站 +varchar(50) +50 + + +D564587F-E7B5-4623-A294-E458F28968C0 +离开班次 +departure_shift +1631006788 +lilili +1631007457 +lilili +离开班次 +varchar(50) +50 + + +588922B1-9DC6-4A2F-AE21-69DC0DACCD17 +同行人 +peer +1631006788 +lilili +1631007457 +lilili +同行人 +varchar(150) +150 + + +80A37586-1102-4469-99DA-9D221B7C5506 +备注 +remark +1631006788 +lilili +1631007457 +lilili +备注 +varchar(50) +50 + + +5201E59C-FC4A-4EBA-BB99-938A0E4FFECB +是否签到 +check_in +1631006788 +lilili +1631007457 +lilili +是否签到 +int(2) +2 + + +7D5AB77F-FC95-44C0-BF5C-E03A3D5231C2 +是否需要接站 +pick_up +1631006788 +lilili +1631007457 +lilili +是否需要接站 +int(2) +2 + + +C3565749-3CAE-49BA-9CAF-F05AE86A5237 +邮寄联系人 +post_contact_id +1631005042 +lilili +1631006036 +lilili +邮寄联系人 +varchar(50) +50 + + +134388AA-86CF-48EB-86C1-77ABC24D2E4B +邮寄联系人地址 +post_contact_address +1631005042 +lilili +1631006036 +lilili +邮寄联系人地址 +varchar(150) +150 + + 5D4700C1-3E02-40E4-A4A4-FED74AEB11F5 缴费方式 pay_mode @@ -10907,7 +11193,7 @@ LABL 0 新宋体,8,N int(2) 2 - + 0AE489AF-15BF-4A62-91D1-8AABB57A58A2 需要发票 need_invoice @@ -10919,7 +11205,19 @@ LABL 0 新宋体,8,N int(2) 2 - + +CDCBE1CC-9208-4F1E-9CFF-C9EDA5BE6024 +付款凭证 +payment_record +1631005042 +lilili +1631006036 +lilili +付款凭证 +varchar(150) +150 + + A9BD46E2-E94B-4104-A4B5-C842CF98BFF2 状态（导入、未导入） status @@ -10931,7 +11229,7 @@ LABL 0 新宋体,8,N int(2) 2 - + DC248113-788F-47BB-9280-9BB2218C7172 是否为新增 is_new @@ -10943,9 +11241,61 @@ LABL 0 新宋体,8,N int(2) 2 + +57BEA887-DD5F-47EB-BB5B-ADD10F975161 +打包 +pack +1629855889 +lilili +1631006036 +lilili +打包 +NULL +int(2) +2 + + +C1BC02F7-41F5-44A4-8985-001D91C9D70C +到账 +in_account +1629855889 +lilili +1631006036 +lilili +到账 +NULL +int(2) +2 + + +CA248336-BFA8-4E88-A25B-3427844E64A6 +开票 +make_invoice +1629855889 +lilili +1631006036 +lilili +开票 +NULL +int(2) +2 + + +A6E24605-4309-4624-AE42-15DCA06A5146 +邮寄 +mail +1629855889 +lilili +1631006036 +lilili +邮寄 +NULL +int(2) +2 + - + 8EAFB8D1-E324-4325-9ADF-5A199B6AC918 Key_1 Key_1 @@ -10959,7 +11309,7 @@ LABL 0 新宋体,8,N - + 9A1865DC-C350-4094-A4D3-0FCB4FA3DB25 Index_1 Index_1 @@ -10969,7 +11319,7 @@ LABL 0 新宋体,8,N lilili 1 - + 8409280A-FDD6-4EF6-969C-3EF576DF83E9 1629862369 lilili @@ -10983,7 +11333,7 @@ LABL 0 新宋体,8,N - + @@ -10997,7 +11347,7 @@ LABL 0 新宋体,8,N 票据邮寄表 - + AC098306-29A3-4435-A05C-757966CCA2E2 id id @@ -11009,7 +11359,7 @@ LABL 0 新宋体,8,N varchar(36) 36 - + 1C668D89-D229-4453-ACAF-9F625B3982AD 创建人 create_by @@ -11021,7 +11371,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + FBAC8348-80F3-4C4F-801F-FC22124A6416 创建日期 create_time @@ -11032,7 +11382,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + B26A31F0-E43D-4506-8238-CF72A2DE33B3 更新人 update_by @@ -11044,7 +11394,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6E067861-387D-46E5-AC94-49FE26CD0475 更新日期 update_time @@ -11055,7 +11405,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + 2CD1F93D-D570-4244-890E-D22A6540BFAF 票号 bill_no @@ -11067,7 +11417,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 0B0294C3-115B-4352-A6D6-293321DFE31B 开票金额 invoice_amount @@ -11079,7 +11429,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 0445147D-BA8F-44A1-8ECE-B1D7539958BD 邮寄状态(1:未邮寄，2::已邮寄) post_status @@ -11091,7 +11441,7 @@ LABL 0 新宋体,8,N int(2) 2 - + C34C0F9E-8778-44E5-8117-5B7895DE2180 快递公司(1:EMS,2:顺丰) send_method @@ -11103,7 +11453,7 @@ LABL 0 新宋体,8,N int(2) 2 - + 98EAA065-2E5A-4FB9-A1FD-57728EAB8C82 快递单号 postNo @@ -11115,7 +11465,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 42F980D5-A151-4E32-8D10-24ABBFC116F7 邮寄时间 sendDate @@ -11126,7 +11476,7 @@ LABL 0 新宋体,8,N 邮寄时间 datetime - + 152F8AC8-70CD-470E-ADD9-749CF5545846 备注 remark @@ -11151,7 +11501,7 @@ LABL 0 新宋体,8,N 催款记录表 - + D6D407E9-5FC2-4BB0-982A-A26C9BF47571 id id @@ -11163,7 +11513,7 @@ LABL 0 新宋体,8,N varchar(36) 36 - + 40005F46-7CAC-4521-863A-D3D95E9E3AAF 创建人 create_by @@ -11175,7 +11525,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 8D9B8558-0536-458E-9066-FAB835A0414D 创建日期 create_time @@ -11186,7 +11536,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + 56EE421A-F3BE-4F13-A169-5935A218D507 更新人 update_by @@ -11198,7 +11548,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 5D87BC72-ED9F-4FA5-8D20-115635E25A0B 更新日期 update_time @@ -11209,7 +11559,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + D5B4E8B5-CA85-4B6A-B3F0-3BA6F37E9D33 项目id project_id @@ -11221,7 +11571,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 472130D9-B604-47B8-855B-E6F8580A6F95 项目类型 project_type @@ -11241,12 +11591,12 @@ LABL 0 新宋体,8,N pay_payment_record 1629857872 lilili -1629949218 +1631007545 lilili 来款记录表 - + 695E88F4-A349-444A-8B3B-3B7F6F21F369 id id @@ -11259,7 +11609,7 @@ LABL 0 新宋体,8,N 36 1 - + CCA66C8C-7E1C-4E4F-8FA7-519D98202173 创建人 create_by @@ -11271,7 +11621,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 263154D3-A4A7-4B76-9BFB-1EDE4557749F 创建日期 create_time @@ -11282,7 +11632,7 @@ LABL 0 新宋体,8,N 创建日期 datetime - + 9178D7CE-28DC-4467-9F80-C38AFDFEAB03 更新人 update_by @@ -11294,7 +11644,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 55EDE403-BAB4-4BA0-B063-9C500BCE1C45 更新日期 update_time @@ -11305,7 +11655,7 @@ LABL 0 新宋体,8,N 更新日期 datetime - + 5427108C-6D65-472A-B7B6-D55620ECBB30 到账金额 amount_received @@ -11317,7 +11667,7 @@ LABL 0 新宋体,8,N int(11) 11 - + A34A2CFF-7D10-495D-9DD8-DEC729BF95C7 来款日期 payment_date @@ -11328,7 +11678,7 @@ LABL 0 新宋体,8,N 来款日期 date - + 4FDEF61C-9585-4929-8FC1-CD602DCA7F87 备注 remark @@ -11340,7 +11690,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + AD2AEDB5-0FBE-4CB8-9AB9-9770E2E97EFB 项目id project_id @@ -11352,9 +11702,21 @@ LABL 0 新宋体,8,N varchar(50) 50 + +604F6EFC-AE22-42AE-A544-89A7CD172344 +项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目） +project_type +1629770667 +lilili +1631007545 +lilili +项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目） +int(2) +2 + - + A00ADFE1-2E37-4575-8CA4-BAAE38C9C400 Key_1 Key_1 @@ -11363,12 +11725,12 @@ LABL 0 新宋体,8,N 1629948780 lilili - + - + @@ -11382,7 +11744,7 @@ LABL 0 新宋体,8,N 会议关联酒店联系人表 - + 79D40983-6B03-4AA7-A5EE-324E59118C38 id id @@ -11395,7 +11757,7 @@ LABL 0 新宋体,8,N 36 1 - + D4126CDC-C004-4A7D-B302-8E698A9978FB 会议id meeting_id @@ -11407,7 +11769,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 820303F6-A685-45C5-9AF3-8B04636F82B3 酒店联系人 hotel_contacts @@ -11420,7 +11782,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 95D2FC73-65B7-4BFF-8539-77C518945896 酒店联系人电话 hotel_contacts_phone @@ -11434,7 +11796,7 @@ LABL 0 新宋体,8,N - + 593525B5-1FFF-447B-91BB-97682E4EAC73 Key_1 Key_1 @@ -11443,12 +11805,12 @@ LABL 0 新宋体,8,N 1630570234 lilili - + - + 710AAEC8-DAD7-4996-B620-4243DE004DB9 Index_1 Index_1 @@ -11458,21 +11820,21 @@ LABL 0 新宋体,8,N lilili 1 - + 4D357558-1A89-4E44-A0E4-A7A084CF918D 1629862369 lilili 1630570234 lilili - + - + @@ -11486,7 +11848,7 @@ LABL 0 新宋体,8,N 工作组成员表 - + B5ABBE13-8978-41E1-AD3F-DDDB20E1C4E9 主键 id @@ -11498,7 +11860,7 @@ LABL 0 新宋体,8,N 32 1 - + FA06DEF1-C390-43C4-A7C2-A2003A9407D4 来款项目 charge_project @@ -11509,7 +11871,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + CD60E39C-8BF1-4896-B61C-E186151F75A9 工作组id working_group_id @@ -11520,7 +11882,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 87C72511-5B50-4472-88FF-CD374E48DCB2 成员单位id charge_company_id @@ -11531,7 +11893,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 2716D9B8-1E27-4E6C-A1BD-B7A6A6AABC1C 临时成员单位id charge_company_temporary_id @@ -11542,7 +11904,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 725024E0-E4DB-4415-BAAF-0251777913B2 临时成员单位 charge_company_temporary_name @@ -11553,7 +11915,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + B0B36BF8-CB06-4123-9358-7968B9ED05B3 企业联系人一id contacts_id_one @@ -11564,7 +11926,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F7D9C9AD-ABD6-46AF-BC4F-D42B0D197778 临时企业联系人一id contacts_temporary_id_one @@ -11575,7 +11937,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + E829F526-4815-4DE3-B2D4-1F6C1ADDE4F3 临时企业联系人二id contacts_temporary_id_two @@ -11586,7 +11948,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + FD06AECC-66A5-43B6-B444-E6C772446126 企业联系人二id contacts_id_two @@ -11597,7 +11959,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0F74439B-D128-493F-9218-8F25B8C87424 临时企业联系人二名称 contacts_temporary_name_two @@ -11608,7 +11970,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A8A995D0-ACF5-41E9-9EE3-18AF7E472999 临时企业联系人一名称 contacts_temporary_name_one @@ -11619,7 +11981,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + CBA5A7CD-63FA-49CA-B76F-361BEC65554E 企业联系人三id contacts_id_three @@ -11630,7 +11992,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3860C8C2-D477-4115-B52A-CB987C997AC3 临时企业联系人三id contacts_temporary_id_three @@ -11641,7 +12003,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 9242DBB2-1C9C-45D9-9231-27103B5C19BD 临时企业联系人三名称 contacts_temporary_name_three @@ -11652,7 +12014,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 8CF293BE-178C-4A08-BD54-5B4A5A5092DB 应收金额（元） receivable_amount @@ -11662,7 +12024,7 @@ LABL 0 新宋体,8,N lilili int - + 51734E8E-7EFC-451F-BFBF-932C3C7D0CA4 实收金额（元） paid_amount @@ -11672,7 +12034,7 @@ LABL 0 新宋体,8,N lilili int - + 599BA026-2429-46FF-9CCF-496D622FF7D4 邮寄联系人id mail_contacts_id @@ -11683,7 +12045,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1350EB09-8F46-4695-98A8-FA7BCA8D795C 临时邮寄联系人id mail_contacts_temporary_id @@ -11694,7 +12056,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A6F98351-3DFD-4333-9587-208C9ED87372 临时邮寄联系人名称 mail_contacts_temporary_name @@ -11705,7 +12067,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 947979AC-1726-4E2B-B599-EBBEE0FC304A 来款方式（1：无，2：合同，3：收费通知） charge_way @@ -11716,7 +12078,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 12679DF0-86C0-44E4-A6CB-0DC8BE5F11F6 合同编号 contract_num @@ -11727,7 +12089,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 3FAF2FB8-1D40-4E6A-9C59-EF2BD998D969 收费通知号 charge_notice_no @@ -11738,7 +12100,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C0EF0A3D-421E-4C27-99AF-C87EB568D214 收费通知文件id charge_notice_id @@ -11749,7 +12111,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 2A1800A1-7DA5-4840-99A7-8A18EAD1670B 打包（1：是，0：否） packaging @@ -11760,7 +12122,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + B9BEBBDA-5F8E-425A-9B9C-EF2E467C8AE0 需要发票（1：增值税普通发票，2：增值税专用发票，0：否） invoice @@ -11771,7 +12133,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 25A703C2-E64E-49DD-AB76-3C50EF64E458 到账（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） in_account @@ -11782,7 +12144,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 04A75917-391D-400A-B75F-7D193CDDAB93 开票（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） make_invoice @@ -11793,7 +12155,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + B7AFDF66-D1B6-47E6-8D83-32A9AE1382C3 邮寄（（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志））） mail @@ -11804,7 +12166,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 9C19895C-62E4-4D33-AD08-160BB198021F 催款次数 press_money_times @@ -11814,7 +12176,7 @@ LABL 0 新宋体,8,N lilili int - + B2F0059B-23E3-4651-BAAA-BA50950E8AB8 备注 remarks @@ -11825,7 +12187,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 0C0BDC77-06A2-4032-9969-C46B9E1D4490 创建人 create_by @@ -11836,7 +12198,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EA969A8F-967D-4A3C-B1EA-C3C30D6CEF00 创建时间 create_time @@ -11846,7 +12208,7 @@ LABL 0 新宋体,8,N lilili datetime - + E26405A2-1358-46A4-B900-6E81DF0FD4D8 更新人 update_by @@ -11857,7 +12219,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8721D655-08B2-43B4-88F0-85D251A7E083 更新时间 update_time @@ -11869,7 +12231,7 @@ LABL 0 新宋体,8,N - + 4C6442E1-D5B3-4230-9543-29296B2D6B36 来款单位 working_group_company_index @@ -11892,7 +12254,7 @@ LABL 0 新宋体,8,N 工作组表 - + 0B0B502F-09B3-452E-A60C-D129BECF8660 主键 id @@ -11904,7 +12266,7 @@ LABL 0 新宋体,8,N 32 1 - + 37C312F3-AF20-4D83-AF74-046A4DF22008 工作组项目 working_group_project @@ -11915,7 +12277,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E9EFCC62-2C07-4F40-A1F7-F191DF49CE9C 运行年份 year @@ -11926,7 +12288,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + FBA5EA91-779E-49BA-8B91-F7AFE8E1906C 负责人Aid principal_id_a @@ -11937,7 +12299,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 890C9A0A-160D-452A-80C3-7B29014BAFC4 负责人名称A principal_name_a @@ -11948,7 +12310,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + F2BC0536-31A7-497F-B3EA-8F4E4B417445 负责人Bid principal_id_b @@ -11959,7 +12321,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + ACE06185-91E1-4E8A-8265-8E8681F11BD5 负责人名称B principal_name_b @@ -11970,7 +12332,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 282FEF2F-FE84-42C6-9079-0B2935A00888 每年召开次数 convoke_num @@ -11981,7 +12343,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6FD9CD8A-E5D4-4DCF-B025-3BB40AAC3C66 运行周期 operation_cycle @@ -11992,7 +12354,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + D6549E68-1633-41E2-ABF6-9DA2DAD29C92 本年应收款A（元） year_charge_a @@ -12002,7 +12364,7 @@ LABL 0 新宋体,8,N lilili int - + 7004849B-2132-4855-A89F-0A6E11E86419 收费通知号A charge_notice_no_a @@ -12013,7 +12375,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 4E5C892B-78E1-41FA-8A16-0003A0669EA5 收费通知文件Aid charge_notice_a_id @@ -12024,7 +12386,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A3D2F294-4EAB-462C-9521-88E7FAD67CF3 本年应收款B（元） year_charge_b @@ -12034,7 +12396,7 @@ LABL 0 新宋体,8,N lilili int - + 453EFDD4-C287-4120-9352-531C9530494E 收费通知号B charge_notice_no_b @@ -12045,7 +12407,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 614D3A6C-D3D2-44D6-A468-62E8B2057359 收费通知文件Bid charge_notice_b_id @@ -12056,7 +12418,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 34CE6F70-AC0B-4DEE-AD1A-33626E16B646 任务及目标 mission_and_objectives @@ -12067,7 +12429,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + FDAC4C4D-06F6-4939-A58D-5F11A08B598C 备注 remarks @@ -12078,7 +12440,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 1B1AD954-EAED-49AD-B76D-64CC770DF594 创建人 create_by @@ -12089,7 +12451,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + C1FEA3A7-C5FC-460A-B68C-B46A3EC9B9E6 创建时间 create_time @@ -12099,7 +12461,7 @@ LABL 0 新宋体,8,N lilili datetime - + 28DB2D37-7F61-4349-843E-1F6002620A89 更新人 update_by @@ -12110,7 +12472,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F5BE8261-722D-4677-9448-ABF2996AC5B7 更新时间 update_time @@ -12122,7 +12484,7 @@ LABL 0 新宋体,8,N - + 792474F8-1713-42EB-B6E2-811C33EC9466 Key_1 Key_1 @@ -12131,12 +12493,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 6658A94F-38AA-4F30-B611-87C3C8990B39 工作组项目 working_group_project_index @@ -12146,19 +12508,19 @@ LABL 0 新宋体,8,N lilili 工作组项目 - + 3E24137B-E1B9-4C3F-9D35-3168A1BEAEDC 1629856948 lilili 1630635062 lilili - + - + 6546CF72-E9C0-4E08-86D1-8801479AD147 负责人 working_group_principal_id_a @@ -12168,21 +12530,21 @@ LABL 0 新宋体,8,N lilili 负责人 - + 88DB043D-5B8D-4B0C-A741-BBA2E6918FC5 1629856965 lilili 1630635062 lilili - + - + @@ -12196,7 +12558,7 @@ LABL 0 新宋体,8,N 普通项目表 - + 63462E2F-51E6-472D-9EAE-E0C73B1AE913 主键 id @@ -12208,7 +12570,7 @@ LABL 0 新宋体,8,N 32 1 - + 6FFAFB84-D16E-405A-9F13-A8E91F04BE7C 来款项目 charge_project @@ -12219,7 +12581,7 @@ LABL 0 新宋体,8,N varchar(100) 100 - + 833CC620-E985-4294-B750-181BE1D82A8F 运行年份 year @@ -12230,7 +12592,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + BB306185-DB46-4626-8FB9-F577C1FFAD21 负责人id principal_id @@ -12241,7 +12603,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4AFF82EC-F2FD-4A57-80DC-C65512E24D34 负责人名称 principal_name @@ -12252,7 +12614,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 5EC925EE-C2F1-4E90-B0AB-105FE7BB4DDF 来款企业id charge_company_id @@ -12263,7 +12625,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 6B67F117-D2DF-4929-822D-D2D6F792B77F 临时来款企业id charge_company_temporary_id @@ -12274,7 +12636,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D61897CB-CA63-4D60-B3E1-F3318CE05C2B 临时来款企业 charge_company_temporary_name @@ -12285,7 +12647,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + BF4B0BC2-0CE5-4F9D-8163-65629E82B3C4 来款用途（字典表） charge_use @@ -12296,7 +12658,7 @@ LABL 0 新宋体,8,N varchar(2) 2 - + 0288BBCC-C5E0-4EF9-83D8-74943138BA1B 联系人id contacts_id @@ -12307,7 +12669,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F6DA9245-6EDC-403C-9BD1-EEEDB30F4F6A 临时联系人id contacts_temporary_id @@ -12318,7 +12680,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F39BF7D4-8D64-4D6B-841B-F8C0F7923AC4 临时联系人名称 contacts_temporary_name @@ -12329,7 +12691,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 369BDC16-A44F-4B75-8874-0631693CEE9E 应收金额（元） receivable_amount @@ -12339,7 +12701,7 @@ LABL 0 新宋体,8,N lilili int - + 167F9B0B-B39E-4228-9AD0-B0858D4EF249 实收金额（元） paid_amount @@ -12349,7 +12711,7 @@ LABL 0 新宋体,8,N lilili int - + A259A3D6-F851-4391-90CC-C8B084B3F73B 邮寄联系人id mail_contacts_id @@ -12360,7 +12722,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 800150C5-A914-4F1C-B805-F0636121D9FA 临时邮寄联系人id mail_contacts_temporary_id @@ -12371,7 +12733,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + DD354327-3611-4808-9D0A-1ACB0B7FB120 临时邮寄联系人名称 mail_contacts_temporary_name @@ -12382,7 +12744,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 21AD801D-ED52-4956-803D-848AAD99C5C9 打包（1：是，0：否） packaging @@ -12393,7 +12755,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 55C6BA44-7961-4306-A84C-FC08C4EF8245 需要发票（1：增值税普通发票，2：增值税专用发票，0：否） invoice @@ -12404,7 +12766,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 1B1DDA6C-7373-4897-B9AA-F4D09644C020 到账（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） in_account @@ -12415,7 +12777,7 @@ LABL 0 新宋体,8,N varchar(1) 1 - + 850B2466-AC5F-427B-9DE2-A72ABD427D6B 开票（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志）） make_invoice @@ -12426,7 +12788,7 @@ LABL 0 新宋体,8,N varchar(1) 1 - + 115A72E9-CA69-4C44-A218-9A025E7212BB 邮寄（（1：全额（对勾），0：0（X），3：>0 && <总金额（半满标志））） mail @@ -12437,7 +12799,7 @@ LABL 0 新宋体,8,N varchar(1) 1 - + 3D9E9A93-8623-4357-993A-AB979B672C9A 来款方式（1：无，2：合同，3：收费通知） charge_way @@ -12448,7 +12810,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 6B4ABDF0-5D2E-48AB-9374-D74DE0FC0CE7 合同编号 contract_num @@ -12459,7 +12821,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7503A1EA-5104-4B1F-ABA6-97FE62EABE03 收费通知号 charge_notice_no @@ -12470,7 +12832,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C36FB5BB-CF8F-463F-9B49-2008A9585FE7 收费通知文件id charge_notice_id @@ -12481,7 +12843,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1CE1B1B6-BC40-42C7-BE00-860570215C7A 催款次数 press_money_times @@ -12491,7 +12853,7 @@ LABL 0 新宋体,8,N lilili int - + A5553767-6FAB-46C7-8806-EB35DD867DDA 备注 remarks @@ -12502,7 +12864,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 680D3ED2-6A95-47D0-95E8-7010B7DD8893 创建人 create_by @@ -12513,7 +12875,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0BBC3A06-F250-486E-A055-AE01568FA982 创建时间 create_time @@ -12523,7 +12885,7 @@ LABL 0 新宋体,8,N lilili datetime - + 4F1919DF-B28C-41D8-9A33-DF0C14C0BCCB 更新人 update_by @@ -12534,7 +12896,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EA0F5715-1D1A-41C6-9B8B-444D9EB1B01B 更新时间 update_time @@ -12546,7 +12908,7 @@ LABL 0 新宋体,8,N - + C4B3377E-81E6-4C03-AE04-2C5E582065EF Key_1 Key_1 @@ -12555,12 +12917,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + BF6C9CB2-1FB7-42F8-9C80-A523C6E25F31 来款项目 common_project_charge_index @@ -12570,19 +12932,19 @@ LABL 0 新宋体,8,N lilili 来款项目 - + 44F869AD-24FF-4AA6-981B-92A0EDF415B4 1629856670 lilili 1630635062 lilili - + - + FE225FC3-33D7-41B4-9C44-291EFAAD7000 来款单位 common_project_company_index @@ -12592,7 +12954,7 @@ LABL 0 新宋体,8,N lilili 来款单位 - + FC888FA1-42F5-48BF-9859-9A6151ED3F64 负责人id common_project_principal_id @@ -12602,19 +12964,19 @@ LABL 0 新宋体,8,N lilili 负责人id - + 8DD80A1D-251C-4A92-B044-DA605DC899E7 1629856809 lilili 1630635062 lilili - + - + 0DCCE0F9-1B84-4DAA-936D-1D6A2644C562 联系人id common_project_contacts_id @@ -12624,21 +12986,21 @@ LABL 0 新宋体,8,N lilili 联系人id - + A8D1DAEE-EF3A-4C9C-9FC1-18A60451C534 1629856852 lilili 1630635062 lilili - + - + @@ -12651,7 +13013,7 @@ LABL 0 新宋体,8,N lilili - + 65385885-CD9C-4962-8638-13FD48A4CD4B 主键 id @@ -12663,7 +13025,7 @@ LABL 0 新宋体,8,N 32 1 - + E7A6641E-62FE-4832-B7EB-5150ACEAD59D 资料目录id data_id @@ -12674,7 +13036,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + FEAEEB79-A3A9-4D74-8AED-F72E30B36572 文件id file_id @@ -12685,7 +13047,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 36110898-0D3F-4136-9DCA-AA4EFE6B6B43 文件目录 file_path @@ -12696,7 +13058,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 222BBD9E-43C7-409F-9873-5B05013151C0 创建人 create_by @@ -12707,7 +13069,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CBE573CA-487C-4E39-B74E-D94A59F80987 创建时间 create_time @@ -12717,7 +13079,7 @@ LABL 0 新宋体,8,N lilili datetime - + 403A6235-F1A7-44BD-9B5F-556083EF214A 更新人 update_by @@ -12728,7 +13090,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + ECDEEA92-5160-4E61-8F9C-68B5FDC16EF1 更新时间 update_time @@ -12740,7 +13102,7 @@ LABL 0 新宋体,8,N - + C8E120C2-A523-43B5-AF0E-16618DA175FA Key_1 Key_1 @@ -12749,12 +13111,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -12767,7 +13129,7 @@ LABL 0 新宋体,8,N lilili - + 826308AC-8487-434F-9AF1-B4987A1E3B59 主键 id @@ -12779,7 +13141,7 @@ LABL 0 新宋体,8,N 32 1 - + FD5F9ABB-8930-4834-B15D-9648FABAE1B4 分标委id committee_id @@ -12790,7 +13152,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 519166AE-595D-485F-BF46-54B704C98785 企业id company_id @@ -12801,7 +13163,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 98E2C063-EEDF-4F77-BFE3-BA9040E0E696 企业名称 company_name @@ -12812,7 +13174,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 11ED1513-C13C-4392-964B-4222E345462F 联系人id contacts_id @@ -12823,7 +13185,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 5F3DAE08-C970-4444-A63E-39496DA35D8E 联系人名称 contacts_name @@ -12834,7 +13196,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 87F3AB90-31B0-4730-8AE6-00D80FDB63E7 创建人 create_by @@ -12845,7 +13207,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + C31D0F90-3D52-4BB7-9D7A-5670B6D6B4FB 创建时间 create_time @@ -12855,7 +13217,7 @@ LABL 0 新宋体,8,N lilili datetime - + DF0C9838-6EEF-42ED-B703-57DAE61DA4B2 更新人 update_by @@ -12866,7 +13228,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D58433BE-E21B-4225-983D-D33FD9899558 更新时间 update_time @@ -12878,7 +13240,7 @@ LABL 0 新宋体,8,N - + C3C1B239-3C57-47D6-A553-1712DEFA1D3B Key_1 Key_1 @@ -12887,12 +13249,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 2AFB29AF-8C26-4679-9DF5-75CA91D3F09F 企业名称 committee_company_name_index @@ -12902,19 +13264,19 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 25EAC282-A8EF-48E2-BB80-84465E4FCE4B 1629855390 lilili 1630635062 lilili - + - + 90447335-F190-4595-A45A-393C779E77DD 姓名 committee_name_index @@ -12924,21 +13286,21 @@ LABL 0 新宋体,8,N lilili 姓名 - + EE15AB09-36F0-4C5E-B8C7-908220E72CA1 1629855421 lilili 1630635062 lilili - + - + @@ -12951,7 +13313,7 @@ LABL 0 新宋体,8,N lilili - + 129E765E-9D82-4C3D-936B-405159030FD5 主键 id @@ -12963,7 +13325,7 @@ LABL 0 新宋体,8,N 32 1 - + 19997065-FB77-4248-9A70-3E0C8511B3CC 资料文件id data_file_id @@ -12974,7 +13336,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4279225A-E598-45E9-90F9-D2FFC298F352 联系人id contacts_id @@ -12985,7 +13347,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 74CC6337-2E11-4EFE-8287-E40CE7DBD029 联系人名称 contacts_name @@ -12996,7 +13358,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 71392DFC-4E1F-4825-B87F-0B5E33ED94F0 创建人 create_by @@ -13007,7 +13369,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1E332EB2-A1F4-405A-98B1-638203BA7E3E 创建时间 create_time @@ -13017,7 +13379,7 @@ LABL 0 新宋体,8,N lilili datetime - + FE7A2728-BA70-444A-B511-47516761D478 更新人 update_by @@ -13028,7 +13390,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CBD3FEF7-3F98-476A-ACA5-421740EC0838 更新时间 update_time @@ -13040,7 +13402,7 @@ LABL 0 新宋体,8,N - + 368FC886-3056-4C52-BCE1-22B959B08778 Key_1 Key_1 @@ -13049,12 +13411,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -13067,7 +13429,7 @@ LABL 0 新宋体,8,N lilili - + 32193E18-AE37-4059-A80F-0804C62DCEF8 主键 id @@ -13079,7 +13441,7 @@ LABL 0 新宋体,8,N 32 1 - + 993E44B1-29A7-435F-B770-118A30AF8952 文件id file_id @@ -13090,7 +13452,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EAFDEAC2-468F-4251-8742-74CEF5F1ECD3 文件名称 file_name @@ -13101,7 +13463,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + DD7B1CA1-3204-4518-8CE6-6A52A28017B5 文件目录 file_path @@ -13112,7 +13474,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F7AB7A05-2AFA-429C-BBC1-145DCDF64D72 企业名称 company_name @@ -13123,7 +13485,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7F72011B-531E-403E-A5C2-4832FFA12415 下载用户名称 download_name @@ -13134,7 +13496,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 317DADDE-2DA7-46BC-9EEF-DF94C37B1BB3 会议名称 meeting_name @@ -13145,7 +13507,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C9E42352-2618-44F9-BA86-8A3D99A7A2C6 创建人 create_by @@ -13156,7 +13518,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F7F9D52C-7A79-4969-B5D4-FA4B3B5E7522 创建时间 create_time @@ -13166,7 +13528,7 @@ LABL 0 新宋体,8,N lilili datetime - + FBBDC379-5B99-4D2D-9B51-193B54ED3D96 更新人 update_by @@ -13177,7 +13539,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 727F342E-4F93-4AA5-86CE-C14A1292FE08 更新时间 update_time @@ -13189,7 +13551,7 @@ LABL 0 新宋体,8,N - + A1D9E4FA-C284-41D5-90C5-192B277D17BF Key_1 Key_1 @@ -13198,12 +13560,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + AC561227-BFDC-445F-BF5E-03AA1C45A969 文件名称 file_name_index @@ -13213,19 +13575,19 @@ LABL 0 新宋体,8,N lilili 文件名称 - + F30A3EDB-11E2-494D-AF33-8ACDDB779B87 1629855750 lilili 1630635062 lilili - + - + 056DD5B6-CAA4-424A-A2A8-4FD2845F2335 用户名称 file_download_name_index @@ -13235,19 +13597,19 @@ LABL 0 新宋体,8,N lilili 用户名称 - + B63A0E3E-F590-4E7D-BEA3-E151B19207FB 1629855886 lilili 1630635062 lilili - + - + 9FBF559B-FBEA-4BA4-8CDB-282BAB073257 会议名称 file_meeting_name_index @@ -13257,19 +13619,19 @@ LABL 0 新宋体,8,N lilili 会议名称 - + 20116498-CE11-4CCF-83E9-8FE37C460502 1629855906 lilili 1630635062 lilili - + - + 722240D2-3F5A-4694-8C7F-AA22B1F78CB4 企业名称 file_company_name_index @@ -13279,21 +13641,21 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 40A81347-F6B6-4D1D-BAC3-44C8A1E82B75 1629855915 lilili 1630635062 lilili - + - + @@ -13306,7 +13668,7 @@ LABL 0 新宋体,8,N lilili - + 44BE483B-AD75-412F-B5BE-FBFA9A8FBA6F 主键 id @@ -13318,7 +13680,7 @@ LABL 0 新宋体,8,N 32 1 - + 2AABB204-7942-4BCB-8220-59F61D5876A8 父id parent_id @@ -13329,7 +13691,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1ED80A2E-D3A4-4C2A-9D24-159DBF1492CA 名称 name @@ -13340,7 +13702,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 58011347-1E14-4C7C-B19C-023D4BFACAFA 排序号 sort @@ -13351,7 +13713,7 @@ LABL 0 新宋体,8,N varchar(3) 3 - + CACDF8EE-85E0-4ABF-903F-EC507DF72AB6 备注 remarks @@ -13362,7 +13724,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + DC70D349-2AB6-4E9A-B2A8-87259DD81833 类型(1：分标委，2：会议) type @@ -13373,7 +13735,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 798EB24D-23B1-4DBA-ADEF-AD1E9984EE97 会议id meeting_id @@ -13384,7 +13746,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CA010A91-4543-44B0-9B26-1B8696506524 创建人 create_by @@ -13395,7 +13757,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 3731F33E-404F-42D7-BCF5-867391FC5E5E 创建时间 create_time @@ -13405,7 +13767,7 @@ LABL 0 新宋体,8,N lilili datetime - + F1BEF608-104D-409E-9F61-9B17888BAF40 更新人 update_by @@ -13416,7 +13778,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0DEDBF2E-1E9B-41F4-999D-A2DD622406D6 更新时间 update_time @@ -13428,7 +13790,7 @@ LABL 0 新宋体,8,N - + F6814184-F8C3-4795-9FE6-9CC8D454BD82 Key_1 Key_1 @@ -13437,12 +13799,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -13455,7 +13817,7 @@ LABL 0 新宋体,8,N lilili - + C212ABFC-D2BB-4705-ADE7-72A92112F3CF 主键 id @@ -13467,7 +13829,7 @@ LABL 0 新宋体,8,N 32 1 - + 7FDAFF74-521B-41BE-BF1C-53DE905DCF70 分标委名称 name @@ -13478,7 +13840,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + C98F7B60-83D3-4E4C-995F-A2CB0E9DA427 备注 remarks @@ -13489,7 +13851,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + F22875F5-7187-42DB-9FD2-5CEF0CBBF7C9 创建人 create_by @@ -13500,7 +13862,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + E74610B7-3A7D-4034-9745-3B1CA9408219 创建时间 create_time @@ -13510,7 +13872,7 @@ LABL 0 新宋体,8,N lilili datetime - + FC40975C-1230-4852-BC8B-472BCE1E79FD 更新人 update_by @@ -13521,7 +13883,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A6266403-1B0B-43CF-847B-6E82974CAFF2 更新时间 update_time @@ -13533,7 +13895,7 @@ LABL 0 新宋体,8,N - + 65BD4241-CE56-4EB3-AE9C-4FDBA79F3F84 Key_1 Key_1 @@ -13542,12 +13904,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 1B48D889-F410-4AF9-91B7-3FFA7F630F13 分标委名称 committee_name_index @@ -13557,21 +13919,21 @@ LABL 0 新宋体,8,N lilili 分标委名称 - + D2E065AB-87A2-410C-A8CC-329085839279 1629855301 lilili 1630635062 lilili - + - + @@ -13584,7 +13946,7 @@ LABL 0 新宋体,8,N LQT - + 53AF09E9-1128-47F9-8FD8-EBD4A979C8C0 主键 id @@ -13596,7 +13958,7 @@ LABL 0 新宋体,8,N 32 1 - + D113651D-C5FE-483B-95E1-0B45F2C628C4 合同id contract_id @@ -13607,7 +13969,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0D0C149A-F9E8-423E-B09D-8A523577FF35 阶段名称 phase_name @@ -13618,7 +13980,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + AEA41363-F07E-4E3A-97AE-CEE9DE36BBB7 应收金额 accounts_receivable_amount @@ -13629,7 +13991,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 44B204B5-3CC8-4955-A3FF-8BC9A68EC0E0 应收时间 accounts_receivable_time @@ -13639,7 +14001,7 @@ LABL 0 新宋体,8,N LQT date - + F7C67B9A-D07D-4E81-9BCE-1B7171F1178A 实收金额 paid_amount @@ -13650,7 +14012,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 80852A90-3EA9-4B46-8064-3DA5B659F384 实收时间 paid_time @@ -13660,7 +14022,7 @@ LABL 0 新宋体,8,N LQT date - + 56B3BE45-4096-4382-9F05-A130EAE15C3B 创建人 create_by @@ -13671,7 +14033,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7BA22E47-517F-46B1-BD27-3B9457A7E023 创建时间 create_time @@ -13681,7 +14043,7 @@ LABL 0 新宋体,8,N lilili datetime - + 5E421B0C-B51A-4844-ABB9-8B1D9D235287 更新人 update_by @@ -13692,7 +14054,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + ECF0D649-D63C-48A1-9205-4659225E900B 更新时间 update_time @@ -13704,7 +14066,7 @@ LABL 0 新宋体,8,N - + EDB7D421-706C-41EF-B5FB-CF45AF391068 Key_1 Key_1 @@ -13713,12 +14075,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -13731,7 +14093,7 @@ LABL 0 新宋体,8,N LQT - + CC509CDA-5958-46D1-BF74-83B5364BD7CF 主键 id @@ -13743,7 +14105,7 @@ LABL 0 新宋体,8,N 32 1 - + A3322CAE-907E-4FFF-BBB9-52F6BD3D459F 合同编号 contract_num @@ -13754,7 +14116,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + AD3CC7C1-4351-4222-A4B4-66954BBAF0B1 合同名称 contract_name @@ -13765,7 +14127,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 4ED01CFA-2190-4D68-9307-19AE67A3E9B9 签订单位id signed_company_id @@ -13776,7 +14138,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 51EE4934-7708-4EF9-9963-CBC32AF1BB05 临时签订单位id signed_company_temporary_id @@ -13787,7 +14149,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D0FE98C1-88A1-4ADD-AB85-BA1394DBAFC6 临时签订单位名称 signed_company_temporary_name @@ -13798,7 +14160,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 9ACA3F07-10E0-4456-BC65-29BEEF758DCC 签订单位联系人id signed_contacts_id @@ -13809,7 +14171,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 712FE759-8C89-4595-86AB-5FB1733C79C9 临时签订单位联系人id signed_contacts_temporary_id @@ -13820,7 +14182,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + BE0B6B28-7368-43B6-AABD-B854CBA3E830 临时签订单位联系人名称 signed_contacts_temporary_name @@ -13831,7 +14193,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E984017A-DB59-46B7-8AB7-84567294FD32 是否开口（1：是，0：否） opening @@ -13842,7 +14204,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 274E3F95-68FB-473D-9F94-7B9185ED6FFE 负责人id principal_id @@ -13853,7 +14215,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4FA1E6FC-9E44-429A-86BE-19A525CA6ED8 负责人名称 principal_name @@ -13864,7 +14226,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 8F4B92ED-BBE5-4A01-9369-2CB3E73EEDD2 部门名称 department_name @@ -13875,7 +14237,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 17204D6A-F657-4AFF-A164-7A045CC10CBD 签订合同金额 contract_amount @@ -13886,7 +14248,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + E9CE7A3B-7056-413B-B763-29B3A0368522 税率 rate @@ -13897,7 +14259,7 @@ LABL 0 新宋体,8,N varchar(3) 3 - + 148568DF-B910-4E14-9262-BB023348D526 未税金额 no_tax_amount @@ -13908,7 +14270,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 58507171-421D-4255-A687-53C7A3D243F8 合同签订日期 contract_date @@ -13918,7 +14280,7 @@ LABL 0 新宋体,8,N lilili date - + 0CAFE4B1-B7C8-4CF5-8B62-773DC80B6016 合同终止日期 termination_date @@ -13928,7 +14290,7 @@ LABL 0 新宋体,8,N lilili date - + D088120E-E3A0-4482-8802-517730B032E7 合同约定主要时点 contract_time_points @@ -13939,7 +14301,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 91859953-516D-4EDA-B6C2-42D2384C901E 应收金额 accounts_receivable_amount @@ -13950,7 +14312,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 798B7BBB-DFE4-43C8-BAB6-3218B23B537A 已收金额 amount_received @@ -13961,7 +14323,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + B06E3B40-4E95-45F4-9494-E51F1BA04B88 未收金额 outstanding_amount @@ -13972,7 +14334,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 2D891728-D38F-4477-8863-4669FA7EE40C 账款状态（1：未支付，2：部分支付，3：已付全款） account_status @@ -13983,7 +14345,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + CF6DEB30-64AA-4D24-8930-88BAB3BB5341 合同约定付款次数 contract_payment_times @@ -13994,7 +14356,7 @@ LABL 0 新宋体,8,N varchar(5) 5 - + CAD6F3FE-D047-4406-A485-479C63F1E86D 是否打包（1：是，0：否） pack @@ -14005,7 +14367,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + AFAFD35A-9A74-42EE-BCF7-B32488CE82DF 打包年份 pack_year @@ -14016,7 +14378,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + C264F307-67F0-45AE-B609-98952F803A5A 合同状态（1：草稿，2：已通过，3：未通过，4：已归档） contract_status @@ -14027,7 +14389,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 3CDDE02A-F95A-41D7-861B-389EB4563E1B 创建人 create_by @@ -14038,7 +14400,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 4BA9D173-9934-4B4A-AB4B-552E8C56F3F5 创建时间 create_time @@ -14048,7 +14410,7 @@ LABL 0 新宋体,8,N lilili datetime - + 871858E4-E32A-4F49-80C6-A2E208D7387A 更新人 update_by @@ -14059,7 +14421,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 42AF3DD7-1A55-472E-A2FE-A593757C5DDC 更新时间 update_time @@ -14071,7 +14433,7 @@ LABL 0 新宋体,8,N - + CA926BCA-F893-4F56-A509-956E547B1807 Key_1 Key_1 @@ -14080,12 +14442,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 5EB00612-1162-4B71-8A6D-EF1AA20C37B9 合同编号 spending_contract_no_index @@ -14095,19 +14457,19 @@ LABL 0 新宋体,8,N lilili 合同编号 - + 3994C44A-D841-4027-82D6-07B0734250F5 1629859931 lilili 1630635062 lilili - + - + EDA9AC6C-27B8-491A-ABD1-CB843D939345 合同名称 spending_contract_name_index @@ -14117,21 +14479,21 @@ LABL 0 新宋体,8,N lilili 合同名称 - + 0CFB5CBC-AC18-496E-A82B-1E158EB9035A 1629859946 lilili 1630635062 lilili - + - + @@ -14144,7 +14506,7 @@ LABL 0 新宋体,8,N lilili - + 6A7F3773-E808-4C43-9FA6-3216856E64F4 主键 id @@ -14156,7 +14518,7 @@ LABL 0 新宋体,8,N 32 1 - + 817762D8-8CD0-4054-B7A7-5E5D9706F057 合同id contract_id @@ -14167,7 +14529,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + FA4A2E02-D624-481D-BEFB-951B6B545288 合同状态（2：已通过，3：未通过，4：已归档） contract_status @@ -14178,7 +14540,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 39015FA4-8C78-46D7-B5ED-DA2361FC8642 拒绝说明 explain_remarks @@ -14189,7 +14551,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + EFD29DD5-BA8D-430A-826C-FFF641944AFA 创建人 create_by @@ -14200,7 +14562,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 79F94B71-B088-4022-BC3E-EA4E96AFF108 创建时间 create_time @@ -14210,7 +14572,7 @@ LABL 0 新宋体,8,N lilili datetime - + F21BBE08-9110-45C8-A52B-2C1241C30424 更新人 update_by @@ -14221,7 +14583,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 9DFA188F-28F7-4E7D-8471-8629CA6EE6F5 更新时间 update_time @@ -14233,7 +14595,7 @@ LABL 0 新宋体,8,N - + 292F9D2F-83AF-4385-AB08-809AC5B8E569 Key_1 Key_1 @@ -14242,12 +14604,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -14260,7 +14622,7 @@ LABL 0 新宋体,8,N LQT - + 926D3EFA-92AC-4569-957A-AD0DE2AA25A9 主键 id @@ -14272,7 +14634,7 @@ LABL 0 新宋体,8,N 32 1 - + 5603721A-0C71-45E7-B4FF-BDDA99A2F09A 合同id contract_id @@ -14283,7 +14645,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 86F36C49-1272-420E-946F-AAC0E66A43F2 项目id project_id @@ -14294,7 +14656,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 29654BA7-486E-42C3-AE64-D5A51CCDF93D 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目） project_type @@ -14305,7 +14667,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + FF2B7CF8-B7C5-47DD-969E-30E694E4EB19 创建人 create_by @@ -14316,7 +14678,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F62B763E-A24A-4352-9BC3-F4A7D09F8DF6 创建时间 create_time @@ -14326,7 +14688,7 @@ LABL 0 新宋体,8,N lilili datetime - + BECC702C-B361-4F1D-8654-4130F7E91DB1 更新人 update_by @@ -14337,7 +14699,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + F6D4D336-06AE-42A8-9848-B286A2A0F2CB 更新时间 update_time @@ -14349,7 +14711,7 @@ LABL 0 新宋体,8,N - + B65E082F-0E27-4187-9A8F-D026DC9710E1 Key_1 Key_1 @@ -14358,12 +14720,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -14376,7 +14738,7 @@ LABL 0 新宋体,8,N LQT - + 3E191DD2-E4A1-4DC9-9B16-06BBAEA00FA9 主键 id @@ -14388,7 +14750,7 @@ LABL 0 新宋体,8,N 32 1 - + 08EB6B8B-34B4-444D-AF88-F3F995935C3E 合同id contract_id @@ -14399,7 +14761,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + A78536D5-34EB-42AC-BE20-DFB6E20FAC1D 阶段名称 phase_name @@ -14410,7 +14772,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 01902CB7-0320-4ECE-88D9-A12580923E35 应收金额 accounts_receivable_amount @@ -14421,7 +14783,7 @@ LABL 0 新宋体,8,N int(11) 11 - + 33C4941B-9D64-4B40-AB13-8815FCC4D3DE 应收时间 accounts_receivable_time @@ -14431,7 +14793,7 @@ LABL 0 新宋体,8,N LQT date - + 94BCB4AD-8947-45ED-B9D9-21A528B1C323 实收金额 paid_amount @@ -14442,7 +14804,7 @@ LABL 0 新宋体,8,N int(11) 11 - + BEA9FB1A-3326-4271-904C-0BAC630F55C7 实收时间 paid_time @@ -14452,7 +14814,7 @@ LABL 0 新宋体,8,N LQT date - + 592EADCA-DD09-4735-96D4-F5230E54AF6F 创建人 create_by @@ -14463,7 +14825,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 61FA60A0-E3EE-44E4-AE1E-47656D1E8007 创建时间 create_time @@ -14473,7 +14835,7 @@ LABL 0 新宋体,8,N lilili datetime - + A1733E29-5B90-40E8-9133-F2EF83B098BE 更新人 update_by @@ -14484,7 +14846,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 157CDFEA-B1EB-4770-8C7C-4C6A960E4E5D 更新时间 update_time @@ -14496,7 +14858,7 @@ LABL 0 新宋体,8,N - + 4DE750D1-E371-42A4-8D8D-F2D4CD1FE8CF Key_1 Key_1 @@ -14505,12 +14867,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + @@ -14523,7 +14885,7 @@ LABL 0 新宋体,8,N LQT - + A02B8DCB-041B-4276-B775-443BCEE30A70 主键 id @@ -14535,7 +14897,7 @@ LABL 0 新宋体,8,N 32 1 - + DD718668-44B8-4AE4-86F7-3D7DA57420C9 合同编号 contract_num @@ -14546,7 +14908,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 30471CE0-84C2-4D55-85E4-9C6561D0DE7D 合同名称 contract_name @@ -14557,7 +14919,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 1C1304EA-318E-4C02-8418-DEF8863DAB21 签订单位id signed_company_id @@ -14568,7 +14930,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 7F60F449-32B7-487C-BCC0-1F97DF6754B0 临时签订单位id signed_company_temporary_id @@ -14579,7 +14941,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0D50B5A5-E0F7-4C4F-BF8E-E688BA775F56 临时签订单位名称 signed_company_temporary_name @@ -14590,7 +14952,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A04A53E1-E74F-47B0-BA53-4D4174547551 签订单位联系人id signed_contacts_id @@ -14601,7 +14963,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + EC27B57C-FC48-4AF1-ADDC-E046F1D31D8B 临时签订单位联系人id signed_contacts_temporary_id @@ -14612,7 +14974,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 7BB2FBEC-3536-486F-BD77-AD0E59528846 临时签订单位联系人名称 signed_contacts_temporary_name @@ -14623,7 +14985,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + B16004D9-4D8F-4E31-B26C-2DB8DBF366CF 是否开口（1：是，0：否） opening @@ -14634,7 +14996,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 0713E854-A125-464F-8D88-497BCFBF5D1A 负责人id principal_id @@ -14645,7 +15007,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 0694D206-FD93-4B5F-B391-19CC55E669A2 负责人名称 principal_name @@ -14656,7 +15018,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + BD06D730-2989-4CF0-8CD9-2E550648B10E 部门名称 department_name @@ -14667,7 +15029,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + F254FF04-0F5C-48AB-AB32-F62A7ABBF40E 签订合同金额 contract_amount @@ -14678,7 +15040,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 9DB8D53D-263A-4200-9D09-D23C0633EA4F 税率 rate @@ -14689,7 +15051,7 @@ LABL 0 新宋体,8,N varchar(3) 3 - + 26F1E531-7084-4914-BFFD-BCDDF76A9C50 未税金额 no_tax_amount @@ -14700,7 +15062,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + A402EF96-CD07-4926-9C1B-AECF18E22851 合同签订日期 contract_date @@ -14710,7 +15072,7 @@ LABL 0 新宋体,8,N lilili date - + 76546AAA-A161-4460-94A6-F08761A889FB 合同终止日期 termination_date @@ -14720,7 +15082,7 @@ LABL 0 新宋体,8,N lilili date - + 0DD4043F-DAAB-4271-8C44-D491F934D88C 合同约定主要时点 contract_time_points @@ -14731,7 +15093,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + EBBE42FE-E8DE-469F-8566-2ED303010743 应收金额 accounts_receivable_amount @@ -14742,7 +15104,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 8603913A-2435-464B-A5B1-0F6D22289EDA 已收金额 amount_received @@ -14753,7 +15115,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + C2DF3D8C-6B21-4248-B84B-59EE1E519FCA 未收金额 outstanding_amount @@ -14764,7 +15126,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 04E5FCDF-5BB2-464A-912B-0B096F356DD7 账款状态（1：未支付，2：部分支付，3：已付全款） account_status @@ -14775,7 +15137,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 08F5F32E-3588-4CD3-90E6-94B6234CC52E 合同约定付款次数 contract_payment_times @@ -14786,7 +15148,7 @@ LABL 0 新宋体,8,N varchar(5) 5 - + 352492AA-01E8-4784-AE9E-8A80F2C07348 是否打包（1：是，0：否） pack @@ -14797,7 +15159,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + CD4F9F58-573E-450D-8248-21B36FDA2DA5 打包年份 pack_year @@ -14808,7 +15170,7 @@ LABL 0 新宋体,8,N varchar(4) 4 - + 094120DB-001D-4623-8B77-9F88F80E3102 合同状态（1：草稿，2：待审核，3：已通过，4：未通过，5：已归档） status @@ -14819,7 +15181,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 7FD275A4-B536-42A2-91F6-51257BCFE186 创建人 create_by @@ -14830,7 +15192,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 98F94E35-73C7-4D68-B696-8A8DAF66E73F 创建时间 create_time @@ -14840,7 +15202,7 @@ LABL 0 新宋体,8,N lilili datetime - + C2B63E5F-AEAB-45B5-9409-7D30EA722F8C 更新人 update_by @@ -14851,7 +15213,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 73A398F7-12E3-41AD-9E72-A23AC0BDA3C2 更新时间 update_time @@ -14863,7 +15225,7 @@ LABL 0 新宋体,8,N - + 669F8D3C-DF0C-46BB-99B3-05411D4FF0F2 Key_1 Key_1 @@ -14872,12 +15234,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 3614C008-C528-4460-B7C6-7A739F04E408 合同编号 income_contract_no_index @@ -14887,19 +15249,19 @@ LABL 0 新宋体,8,N lilili 合同编号 - + 2EE658E4-384B-41B6-9DB0-169887D8FFB6 1629854544 lilili 1630635062 lilili - + - + F30F270B-5761-493F-9650-13F9CED0FC72 合同名称 income_contract_name_index @@ -14909,21 +15271,21 @@ LABL 0 新宋体,8,N lilili 合同名称 - + 94CAD0BF-08A3-4F81-8CC8-112690281FE2 1629854598 lilili 1630635062 lilili - + - + @@ -14937,7 +15299,7 @@ LABL 0 新宋体,8,N 联系人管理临时表 - + 34445793-4870-4ABF-AE5D-0C191587E081 主键 id @@ -14949,7 +15311,7 @@ LABL 0 新宋体,8,N 32 1 - + F3678230-BD3D-476D-93B1-6F369E88618A 企业id company_id @@ -14960,7 +15322,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 95F46437-7EC5-4EDE-94BE-72A35CC9D512 企业名称 company_name @@ -14971,7 +15333,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + B4B234A8-7BE2-43E5-B5DB-C4D1E276D56E 姓名 name @@ -14982,7 +15344,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + A192942F-5F37-4421-B1E3-844E1AAEEFC5 性别（1：男，2：女） gender @@ -14993,7 +15355,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + EF7E7C6C-DDF5-4214-B23A-175F5006EDCB 职务 post @@ -15004,7 +15366,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 75CE318E-04B5-4A2B-9BD0-2936FA7D229E 手机号 phone @@ -15015,7 +15377,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 3593EB75-66DE-4B7F-830A-F2B27B0CB1DC 邮箱 email @@ -15026,7 +15388,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 141502C7-1FE0-4EC9-93B2-94BE39DD0999 通讯地址 contact_address @@ -15037,7 +15399,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 0A733192-4274-40CD-BD10-0B6AAD5C4F3B 邮政编码 postal_code @@ -15048,7 +15410,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + 818805FF-80D4-44CB-AF92-B286B46C1913 数据来源(1：管理端，2：报名) data_source @@ -15059,7 +15421,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + FEE1143F-EDB4-4010-943C-72FC577B90B3 报名新增（1：是，0：否） signing_up @@ -15070,7 +15432,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 24862780-EF34-4607-8190-6094D056B381 备注 remarks @@ -15081,7 +15443,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 6FA0793D-EAC0-4F1A-9AC1-05849215D4B5 创建人 create_by @@ -15092,7 +15454,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 51445942-D04D-4857-B5EC-9C20BB7CA9D5 创建时间 create_time @@ -15102,7 +15464,7 @@ LABL 0 新宋体,8,N lilili datetime - + CD262609-3EC5-4DB8-ABF9-235CEB11E0D4 更新人 update_by @@ -15113,7 +15475,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 8FAD0195-14F9-493A-BB33-7D60A44709B3 更新时间 update_time @@ -15125,7 +15487,7 @@ LABL 0 新宋体,8,N - + 289DCD0F-5060-4197-B2C5-D635D1BA72BE Key_1 Key_1 @@ -15134,12 +15496,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 5D2EA952-48A1-4003-9C5C-A9C14DAA5983 企业名称 contacts_company_name_index @@ -15149,19 +15511,19 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 9660727D-BC83-4721-837D-17B4ABDF4464 1629853614 lilili 1630635062 lilili - + - + 617248A5-D5E4-4B04-9F2B-240152791DEE 姓名 contacts_name_index @@ -15171,19 +15533,19 @@ LABL 0 新宋体,8,N lilili 姓名 - + 5DA4F19C-08D5-4AFE-A4DA-0A2AF0AF7708 1629853656 lilili 1630635062 lilili - + - + 22635D0B-1F75-4C65-9E9A-DC0CE1F681E2 手机号 contacts_phone_index @@ -15193,21 +15555,21 @@ LABL 0 新宋体,8,N lilili 手机号 - + 7C242518-6C3E-4A3A-B50B-719B8E9B415D 1629854483 lilili 1630635062 lilili - + - + @@ -15221,7 +15583,7 @@ LABL 0 新宋体,8,N 企业管理临时表 - + B2FE3135-A7C4-4531-B912-AAE9A850464F 主键 id @@ -15233,7 +15595,7 @@ LABL 0 新宋体,8,N 32 1 - + D8433323-BA3A-48A1-A312-98994789BA6E 企业名称 company_name @@ -15244,7 +15606,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E81D3858-0B38-4868-A933-3B721FCC6BB8 公司地址 company_address @@ -15255,7 +15617,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 1FC5AE02-DA3D-4E37-A5CB-9E20FD4D3A46 公司电话 company_phone @@ -15266,7 +15628,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 29A2564C-CFD6-47D3-845B-6B624E31040D 邮编 postal_code @@ -15277,7 +15639,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + 2615950E-236A-4006-8715-545C9FBC6521 银行户名 bank_account_name @@ -15288,7 +15650,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + E8D0C1F0-B754-4BF3-BFDD-022795B25BEA 开户行 opening_bank @@ -15299,7 +15661,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + ADE43F63-CA98-48B5-ABF7-2D16747D09EA 银行账号 bank_account @@ -15310,7 +15672,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + DAF30B41-EADF-4BA8-A3AE-C6A18374D0C5 税号 duty_code @@ -15321,7 +15683,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + D4174A18-41AF-4335-B0B3-AD225079D17B 数据来源(1：管理端，2：报名) data_source @@ -15332,7 +15694,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 58BAF47A-42F1-4516-AF35-9CBF7E8DE3D3 报名新增（1：是，0：否） signing_up @@ -15343,7 +15705,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 68653960-84F7-46C5-B911-FF5F5B1F7E4F 备注 remarks @@ -15354,7 +15716,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 9405D526-14CA-4EDA-BEB5-96EF1466EA86 创建人 create_by @@ -15365,7 +15727,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + D4FB9A98-9A72-4A5A-B8A2-7439A4E0827B 创建时间 create_time @@ -15375,7 +15737,7 @@ LABL 0 新宋体,8,N lilili datetime - + FAEA725E-102E-4C04-8B35-CE4F2F8C7EBB 更新人 update_by @@ -15386,7 +15748,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 1CFD7D8F-2D96-4B2F-9114-A1C602F8AA60 更新时间 update_time @@ -15398,7 +15760,7 @@ LABL 0 新宋体,8,N - + 3D5694FA-CDC5-4FDF-BC98-2C9591E8CD27 Key_1 Key_1 @@ -15407,12 +15769,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 67102A18-F9A5-414F-89FC-7AEDA6251688 企业名称 company_name_index @@ -15422,21 +15784,21 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 0DBE570E-5726-42B2-8F2F-1CE18AA9616E 1629852781 lilili 1630635062 lilili - + - + @@ -15449,7 +15811,7 @@ LABL 0 新宋体,8,N lilili - + 1501DAA3-D8B6-4178-AF91-FB33CB666BCE 主键 id @@ -15461,7 +15823,7 @@ LABL 0 新宋体,8,N 32 1 - + AADFD507-2374-4006-A893-DAB26CBF0792 企业id company_id @@ -15472,7 +15834,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 79EFEA2B-032A-4758-A4D6-54577B97E983 企业名称 company_name @@ -15483,7 +15845,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + D314E871-4E31-4725-808A-86E609BD39F2 姓名 name @@ -15494,7 +15856,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 099FCABD-A4A6-4B22-877B-5BF3905EE706 性别（1：男，2：女） gender @@ -15505,7 +15867,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + CB6A13B6-2377-4EF3-908D-52C97CE04672 职务 post @@ -15516,7 +15878,7 @@ LABL 0 新宋体,8,N varchar(20) 20 - + 44311CEB-FADF-4024-827B-8D61825361BD 手机号 phone @@ -15527,7 +15889,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A6120E79-82E7-4354-A934-4BB168026D4E 邮箱 email @@ -15538,7 +15900,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A3098728-9995-4C52-83ED-EA097A6B88D9 通讯地址 contact_address @@ -15549,7 +15911,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + BD682759-BB92-4F0D-9C1E-6D4E5FD5DA5D 邮政编码 postal_code @@ -15560,7 +15922,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + F35C58C4-6B72-4842-90E5-8D4B6ABC9376 数据来源(1：管理端，2：报名) data_source @@ -15571,7 +15933,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 5AB11854-9385-4DA0-A032-92487922DDD1 报名新增（1：是，0：否） signing_up @@ -15582,7 +15944,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 61F4A6FE-B7E8-4363-ACC1-EAA64C7DD56B 备注 remarks @@ -15593,7 +15955,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 95BC51F1-C344-49B8-95FE-9B60AE8E56D2 创建人 create_by @@ -15604,7 +15966,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 6DCF7930-B5DF-4BDF-8AE1-88FBBA4A71A3 创建时间 create_time @@ -15614,7 +15976,7 @@ LABL 0 新宋体,8,N lilili datetime - + 459D2158-B942-415D-98EE-E8125DE29D42 更新人 update_by @@ -15625,7 +15987,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + CF38F24E-95E4-40D2-B920-7EFC00A18291 更新时间 update_time @@ -15637,7 +15999,7 @@ LABL 0 新宋体,8,N - + DAB99C9E-BF59-4552-A138-749242509771 Key_1 Key_1 @@ -15646,12 +16008,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + ED73FB1B-5674-4AC7-A20D-5B84EED9179D 企业名称 contacts_company_name_index @@ -15661,19 +16023,19 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 1403EEEC-DC59-4205-9F74-47F70F4F3B16 1629853614 lilili 1630635062 lilili - + - + C875FC05-F7D8-4EEE-A40F-5A07684B522E 姓名 contacts_name_index @@ -15683,19 +16045,19 @@ LABL 0 新宋体,8,N lilili 姓名 - + 1787A682-0632-4D74-BDAC-FA58187BBBEC 1629853656 lilili 1630635062 lilili - + - + 096C9303-97B8-4142-9A19-CC90B0FECBBC 手机号 contacts_phone_index @@ -15705,21 +16067,21 @@ LABL 0 新宋体,8,N lilili 手机号 - + D77F0998-7E47-4CCF-A5D2-F61175BA1A55 1629854483 lilili 1630635062 lilili - + - + @@ -15733,7 +16095,7 @@ LABL 0 新宋体,8,N 企业管理 - + E4F45814-2EA1-49EE-9333-44343C0F49E5 主键 id @@ -15745,7 +16107,7 @@ LABL 0 新宋体,8,N 32 1 - + C69BE155-C773-41F1-B028-B69798A49006 企业名称 company_name @@ -15756,7 +16118,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 0D4BEEDC-DA5C-43B4-B663-452F127F3799 公司地址 company_address @@ -15767,7 +16129,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + D0E99A77-4168-415C-B8C5-3CA6690BDDBE 公司电话 company_phone @@ -15778,7 +16140,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + FC79E7B6-DC18-466C-9119-31A877D69ACD 邮编 postal_code @@ -15789,7 +16151,7 @@ LABL 0 新宋体,8,N varchar(6) 6 - + 1E6E1A91-508E-4579-97D6-4F833237D260 银行户名 bank_account_name @@ -15800,7 +16162,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 04C75FEE-F54E-4262-ACCA-C3EC4A020CFB 开户行 opening_bank @@ -15811,7 +16173,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + A4DE19EB-5ABE-429C-991F-6152912C74BA 银行账号 bank_account @@ -15822,7 +16184,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 6A76FC34-6E63-4A36-AA08-796B4D2DEFD9 税号 duty_code @@ -15833,7 +16195,7 @@ LABL 0 新宋体,8,N varchar(50) 50 - + 57FF0A5D-0DB9-4C62-A09C-358E762CFB7D 数据来源(1：管理端，2：报名) data_source @@ -15844,7 +16206,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + 6C27C1A6-D1E1-4C2A-B2DC-43A70A1ACBF1 报名新增（1：是，0：否） signing_up @@ -15855,7 +16217,7 @@ LABL 0 新宋体,8,N tinyint(1) 1 - + B904B345-FCF6-48A2-8122-49EFC727CA42 备注 remarks @@ -15866,7 +16228,7 @@ LABL 0 新宋体,8,N varchar(200) 200 - + 8BC8B736-EEB4-4C47-BB70-97B5DB649AEB 创建人 create_by @@ -15877,7 +16239,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 13F6067A-9E37-4D0D-9AA0-050BE1971026 创建时间 create_time @@ -15887,7 +16249,7 @@ LABL 0 新宋体,8,N lilili datetime - + 03DF5D33-EAB4-4040-BE2D-2FC40100D77E 更新人 update_by @@ -15898,7 +16260,7 @@ LABL 0 新宋体,8,N varchar(32) 32 - + 337CDE3E-B9B4-4C63-AF0C-28EA99202D61 更新时间 update_time @@ -15910,7 +16272,7 @@ LABL 0 新宋体,8,N - + 1C236921-A5A8-454E-828A-852A3E6A961D Key_1 Key_1 @@ -15919,12 +16281,12 @@ LABL 0 新宋体,8,N 1630635062 lilili - + - + 5A5226CB-E23C-4E4B-8FF9-4DAF8A1F618F 企业名称 company_name_index @@ -15934,26 +16296,26 @@ LABL 0 新宋体,8,N lilili 企业名称 - + 047E4CCD-9D6C-48E0-96ED-32A104EB4788 1629852781 lilili 1630635062 lilili - + - + - + DF30943D-F7AB-4FE7-8EDF-47FAAD7F38A3 PUBLIC PUBLIC @@ -16044,7 +16406,7 @@ LABL 0 新宋体,8,N - + 83F81B76-D862-44FC-AD9D-F174C91D40F8 MySQL 5.0 MYSQL50 From 48bd77818f51dd3512f8168f33b75cf5349375a2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 7 Sep 2021 18:06:26 +0800 Subject: [PATCH 11/11] =?UTF-8?q?update=20[PayPaymentRecord.java=EF=BC=8CP?= =?UTF-8?q?ayMeetingSituation.java]=E8=A1=A5=E5=85=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/entity/PayMeetingSituation.java | 169 ++++++++++++++++-- .../mapper/xml/PayMeetingSituationMapper.xml | 35 +++- .../impl/PayMeetingSituationServiceImpl.java | 2 +- .../jero/payment/entity/PayPaymentRecord.java | 4 + 4 files changed, 196 insertions(+), 14 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index b446a4a1..5c19d1fd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -19,7 +19,7 @@ import lombok.experimental.Accessors; /** * @Description: 会议报名信息 * @Author: jero-boot - * @Date: 2021-09-02 + * @Date: 2021-09-07 * @Version: V1.0 */ @Data @@ -70,26 +70,95 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "企业名称") private String companyName; - /**姓名*/ - @Excel(name = "姓名", width = 15) - @ApiModelProperty(value = "姓名") - private String userName; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private String companyContactId; - /**身份*/ - @Excel(name = "身份", width = 15) - @ApiModelProperty(value = "身份") - private Integer identity; + /**企业联系人姓名*/ + @Excel(name = "企业联系人姓名", width = 15) + @ApiModelProperty(value = "企业联系人姓名") + private String companyContactName; + + /**职务*/ + @Excel(name = "职务", width = 15) + @ApiModelProperty(value = "职务") + private String post; /**手机号*/ @Excel(name = "手机号", width = 15) @ApiModelProperty(value = "手机号") private String phone; + /**邮箱*/ + @Excel(name = "邮箱", width = 15) + @ApiModelProperty(value = "邮箱") + private String email; + + /**身份*/ + @Excel(name = "身份", width = 15) + @ApiModelProperty(value = "身份") + private Integer identity; + + /**嘉宾类型*/ + @Excel(name = "嘉宾类型", width = 15) + @ApiModelProperty(value = "嘉宾类型") + private Integer guestType; + + /**演讲题目*/ + @Excel(name = "演讲题目", width = 15) + @ApiModelProperty(value = "演讲题目") + private String speechTopic; + + /**演讲ppt*/ + @Excel(name = "演讲ppt", width = 15) + @ApiModelProperty(value = "演讲ppt") + private String speechPpt; + + /**照片*/ + @Excel(name = "照片", width = 15) + @ApiModelProperty(value = "照片") + private String photo; + + /**个人简介*/ + @Excel(name = "个人简介", width = 15) + @ApiModelProperty(value = "个人简介") + private String profile; + + /**是否用餐*/ + @Excel(name = "是否用餐", width = 15) + @ApiModelProperty(value = "是否用餐") + private Integer haveMeals; + + /**是否回民*/ + @Excel(name = "是否回民", width = 15) + @ApiModelProperty(value = "是否回民") + private Integer huiPeople; + /**是否入住协议酒店*/ @Excel(name = "是否入住协议酒店", width = 15) @ApiModelProperty(value = "是否入住协议酒店") private Integer checkInHotel; + /**入住酒店时间*/ + @Excel(name = "入住酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "入住酒店时间") + private java.util.Date inHotelTime; + + /**离开酒店时间*/ + @Excel(name = "离开酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "离开酒店时间") + private java.util.Date outHotelTime; + + /**房型*/ + @Excel(name = "房型", width = 15) + @ApiModelProperty(value = "房型") + private String roomLayout; + /**抵达时间*/ @Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -97,12 +166,67 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "抵达时间") private java.util.Date arrivalTime; + /**到达站*/ + @Excel(name = "到达站", width = 15) + @ApiModelProperty(value = "到达站") + private String destination; + + /**到达班次*/ + @Excel(name = "到达班次", width = 15) + @ApiModelProperty(value = "到达班次") + private String arrivalShift; + + /**是否需要送站*/ + @Excel(name = "是否需要送站", width = 15) + @ApiModelProperty(value = "是否需要送站") + private Integer deliveryStation; + /**离开时间*/ @Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "离开时间") - private java.util.Date leaveTime; + private java.util.Date departureTime; + + /**离开站*/ + @Excel(name = "离开站", width = 15) + @ApiModelProperty(value = "离开站") + private String departureStation; + + /**离开班次*/ + @Excel(name = "离开班次", width = 15) + @ApiModelProperty(value = "离开班次") + private String departureShift; + + /**同行人*/ + @Excel(name = "同行人", width = 15) + @ApiModelProperty(value = "同行人") + private String peer; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + + /**是否签到*/ + @Excel(name = "是否签到", width = 15) + @ApiModelProperty(value = "是否签到") + private Integer checkIn; + + /**是否需要接站*/ + @Excel(name = "是否需要接站", width = 15) + @ApiModelProperty(value = "是否需要接站") + private Integer pickUp; + + /**邮寄联系人*/ + @Excel(name = "邮寄联系人", width = 15) + @ApiModelProperty(value = "邮寄联系人") + private String postContactId; + + /**邮寄联系人地址*/ + @Excel(name = "邮寄联系人地址", width = 15) + @ApiModelProperty(value = "邮寄联系人地址") + private String postContactAddress; /**缴费方式*/ @Excel(name = "缴费方式", width = 15) @@ -114,6 +238,11 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "需要发票") private Integer needInvoice; + /**付款凭证*/ + @Excel(name = "付款凭证", width = 15) + @ApiModelProperty(value = "付款凭证") + private String paymentRecord; + /**状态（导入、未导入）*/ @Excel(name = "状态（导入、未导入）", width = 15) @ApiModelProperty(value = "状态（导入、未导入）") @@ -124,4 +253,24 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "是否为新增") private Integer isNew; + /**打包*/ + @Excel(name = "打包", width = 15) + @ApiModelProperty(value = "打包") + private Integer pack; + + /**到账*/ + @Excel(name = "到账", width = 15) + @ApiModelProperty(value = "到账") + private Integer inAccount; + + /**开票*/ + @Excel(name = "开票", width = 15) + @ApiModelProperty(value = "开票") + private Integer makeInvoice; + + /**邮寄*/ + @Excel(name = "邮寄", width = 15) + @ApiModelProperty(value = "邮寄") + private Integer mail; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml index dc620eab..a6889edc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml @@ -10,15 +10,44 @@ - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 5406946e..5041d202 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 会议报名信息 * @Author: jero-boot - * @Date: 2021-09-02 + * @Date: 2021-09-07 * @Version: V1.0 */ @Service diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index 1773d40d..9c25f84c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -35,6 +35,10 @@ public class PayPaymentRecord implements Serializable { @Excel(name = "项目id", width = 15) @ApiModelProperty(value = "项目id") private java.lang.String projectId; + /**项目类型*/ + @Excel(name = "项目类型", width = 15) + @ApiModelProperty(value = "项目类型") + private java.lang.String projectType; /**到账金额*/ @Excel(name = "到账金额", width = 15) @ApiModelProperty(value = "到账金额")