diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index fb88fef0..af854350 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -4,6 +4,8 @@ package com.ydw.bat.wkflow.business_auth; import com.ydw.bat.wkflow.business_main.datas.dto.*; import com.ydw.bat.wkflow.business_main.datas.entity.*; import com.ydw.bat.wkflow.business_slrs.dao.*; +import com.ydw.bat.wkflow.wgdEntity.*; +import io.swagger.annotations.ApiModelProperty; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Component; @@ -120,24 +122,145 @@ public interface LawsUserInfoService { public String batchInsert(@RequestBody List standProjectRelationDtos); - - + /** + * 日历显示会议日程--流程结束生成会议 (标准化活动,政策课题组) + * @param sapMeeting (id, title, type, ...) type: 1,标准化活动;2,政策课题组 + * @return 插入成功标志位 int + */ @PostMapping("/sapMeetInfo/addMeeting") public int addMeeting(@RequestBody SapMeeting sapMeeting); - @GetMapping("/sapMeetInfo/getMeetingsByMonth") - public List getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date); - + /** + * 日历显示会议日程--按年,月查找当月会议列表 (标准化活动,政策课题组) + * @param date 日期; type: 1,标准化活动;2,政策课题组 + * @return 当月会议列表 List + */ @GetMapping("/sapMeetInfo/getMeetingsByMonthType") public List getMeetingsByMonthType(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); - @GetMapping("/sapMeetInfo/getMeetingsByDate") - public List getMeetingsByDate(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); - @GetMapping("/sapMeetInfo/getOneById") - public SapMeeting getOneById(@RequestParam("id") String id); + /** + * 工作组数据信息统计接口-协会费用信息统计 + */ + //获取所有 + @GetMapping("wgdCensusZ/wgd-assoc-cost/getAllAssocCosts") + public List getAllWgdAssocCosts(); + //多条件查询 + @PostMapping("wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts") + public List queryAllAssocCosts(WgdAssocCost wgdAssocCost); + //获取单个详情 + @GetMapping("wgdCensusZ/wgd-assoc-cost/getAssocCostById") + public WgdAssocCost getWgdAssocCostById(String id); + //编辑 + @PostMapping("wgdCensusZ/wgd-assoc-cost/modAssocCost") + int updateWgdAssocCost(WgdAssocCost wgdAssocCost); + //添加 + @PostMapping("wgdCensusZ/wgd-assoc-cost/addAssocCost") + int insertWgdAssocCost(WgdAssocCost wgdAssocCost); + //删除单个 + @GetMapping("wgdCensusZ/wgd-assoc-cost/delAssocCost") + int deleteWgdAssocCost(String id); + //批量删除 + @GetMapping("wgdCensusZ/wgd-assoc-cost/delAssocCosts") + int deleteWgdAssocCosts(String ids); + + /** + * 工作组数据信息统计接口-协会信息数据统计 + */ + @GetMapping("wgdCensusZ/wgd-assoc-info/getAllAssocInfos") + public List getAllWgdAssocInfos(); + + @PostMapping("wgdCensusZ/wgd-assoc-info/queryAllAssocInfos") + public List queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo); + + @GetMapping("wgdCensusZ/wgd-assoc-info/getAssocInfoById") + public WgdAssocInfo getWgdAssocInfoById(String id); + + @PostMapping("wgdCensusZ/wgd-assoc-info/modAssocInfo") + int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo); + + @PostMapping("wgdCensusZ/wgd-assoc-info/addAssocInfo") + int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo); + + @GetMapping("wgdCensusZ/wgd-assoc-info/delAssocInfo") + int deleteWgdAssocInfo(String id); + + @GetMapping("wgdCensusZ/wgd-assoc-info/delAssocInfos") + int deleteWgdAssocInfos(String ids); + + /** + * 工作组数据信息统计接口-委员信息数据统计 + */ + + @GetMapping("wgdCensusZ/wgd-commi-info/getAllCommiInfos") + public List getAllWgdCommiInfos(); + + @PostMapping("wgdCensusZ/wgd-commi-info/queryAllCommiInfos") + public List queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo); + + @GetMapping("wgdCensusZ/wgd-commi-info/getCommiInfoById") + public WgdCommiInfo getWgdCommiInfoById(String id); + + @PostMapping("wgdCensusZ/wgd-commi-info/modCommiInfo") + int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo); + + @PostMapping("wgdCensusZ/wgd-commi-info/addCommiInfo") + int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo); + + @GetMapping("wgdCensusZ/wgd-commi-info/delCommiInfo") + int deleteWgdCommiInfo(String id); + + @GetMapping("wgdCensusZ/wgd-commi-info/delCommiInfos") + int deleteWgdCommiInfos(String ids); + + /** + * 工作组数据信息统计接口-参与外部标准制修订费用统计 + */ + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/getAllExReviseCosts") + public List getAllWgdExReviseCosts(); + + @PostMapping("wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts") + public List queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost); + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/getExReviseCostById") + public WgdExReviseCost getWgdExReviseCostById(String id); + + @PostMapping("wgdCensusZ/wgd-ex-revise-cost/modExReviseCost") + int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost); + + @PostMapping("wgdCensusZ/wgd-ex-revise-cost/addExReviseCost") + int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost); + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/delExReviseCost") + int deleteWgdExReviseCost(String id); + + @GetMapping("wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts") + int deleteWgdExReviseCosts(String ids); + + /** + * 工作组数据信息统计接口-参会费用信息统计 + */ + @GetMapping("wgdCensusZ/wgd-meet-cost/getAllMeetCosts") + public List getAllWgdMeetCosts(); + + @PostMapping("wgdCensusZ/wgd-meet-cost/queryAllMeetCosts") + public List queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost); + + @GetMapping("wgdCensusZ/wgd-meet-cost/getMeetCostById") + public WgdMeetCost getWgdMeetCostById(String id); + + @PostMapping("wgdCensusZ/wgd-meet-cost/modMeetCost") + int updateWgdMeetCost(WgdMeetCost WgdMeetCost); + + @PostMapping("wgdCensusZ/wgd-meet-cost/addMeetCost") + int insertWgdMeetCost(WgdMeetCost WgdMeetCost); + + @GetMapping("wgdCensusZ/wgd-meet-cost/delMeetCost") + int deleteWgdMeetCost(String id); + + @GetMapping("wgdCensusZ/wgd-meet-cost/delMeetCosts") + int deleteWgdMeetCosts(String ids); - @PostMapping("/sapMeetInfo/getDateMeeting") - public int getDateMeeting(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("id") String id,@RequestParam("type") int type); } diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java new file mode 100644 index 00000000..a17eb25c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocCost.java @@ -0,0 +1,50 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + *

+ * 协会费用信息统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计") +public class WgdAssocCost{ + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会费标准") + private BigDecimal payStandard; + + @ApiModelProperty(value = "实际发生") + private BigDecimal payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "每年缴费情况") + private String annualPayment; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java new file mode 100644 index 00000000..2884fcf8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdAssocInfo.java @@ -0,0 +1,141 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 协会信息数据统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计") +public class WgdAssocInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会员角色") + private String role; + + @ApiModelProperty(value = "参与人") + private String attend; + + @ApiModelProperty(value = "标准") + private String standard; + + @ApiModelProperty(value = "标准负责人") + private String charge; + + @ApiModelProperty(value = "责任领导") + private String leader; + + @ApiModelProperty(value = "初始入会时间") + private LocalDateTime iniTime; + + @ApiModelProperty(value = "本届入会时间") + private LocalDateTime curTime; + + @ApiModelProperty(value = "费用标准") + private BigDecimal costStandard; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "上次缴纳时间") + private LocalDateTime lastPayTime; + + @ApiModelProperty(value = "缴费年限") + private String payPeriod; + + @ApiModelProperty(value = "经办人") + private String handler; + + @ApiModelProperty(value = "部门") + private String department; + + @ApiModelProperty(value = "协会性质") + private String asProper; + + @ApiModelProperty(value = "协会状态") + private String asStatus; + + @ApiModelProperty(value = "协会联络人") + private String asContact; + + @ApiModelProperty(value = "协会联络人电话") + private String tel; + + @ApiModelProperty(value = "协会联络人邮箱") + private String mail; + + @ApiModelProperty(value = "2017缴费") + private BigDecimal p17; + + @ApiModelProperty(value = "2018缴费") + private BigDecimal p18; + + @ApiModelProperty(value = "2019缴费") + private BigDecimal p19; + + @ApiModelProperty(value = "2020缴费") + private BigDecimal p20; + + @ApiModelProperty(value = "2021缴费") + private BigDecimal p21; + + @ApiModelProperty(value = "2022缴费") + private BigDecimal p22; + + @ApiModelProperty(value = "2023缴费") + private BigDecimal p23; + + @ApiModelProperty(value = "2024缴费") + private BigDecimal p24; + + @ApiModelProperty(value = "2025缴费") + private BigDecimal p25; + + @ApiModelProperty(value = "2026缴费") + private BigDecimal p26; + + @ApiModelProperty(value = "2027缴费") + private BigDecimal p27; + + @ApiModelProperty(value = "2028缴费") + private BigDecimal p28; + + @ApiModelProperty(value = "2029缴费") + private BigDecimal p29; + + @ApiModelProperty(value = "2030缴费") + private BigDecimal p30; + + @ApiModelProperty(value = "2031缴费") + private BigDecimal p31; + + @ApiModelProperty(value = "2032缴费") + private BigDecimal p32; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java new file mode 100644 index 00000000..e8a3bdbc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdCommiInfo.java @@ -0,0 +1,74 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + *

+ * 委员信息数据统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计") +public class WgdCommiInfo { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "提报单位名称") + private String unit; + + @ApiModelProperty(value = "协会名称-标委会") + private String scName; + + @ApiModelProperty(value = "协会名称-分标委") + private String sscName; + + @ApiModelProperty(value = "协会名称-工作组") + private String wgName; + + @ApiModelProperty(value = "会员角色") + private String role; + + @ApiModelProperty(value = "参与人") + private String attend; + + @ApiModelProperty(value = "本届入会时间") + private LocalDateTime curTime; + + @ApiModelProperty(value = "职务") + private String job; + + @ApiModelProperty(value = "所在部门") + private String department; + + @ApiModelProperty(value = "联系方式") + private String tel; + + @ApiModelProperty(value = "任期") + private String term; + + @ApiModelProperty(value = "证书") + private String certificate; + + @ApiModelProperty(value = "账号") + private String account; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java new file mode 100644 index 00000000..80e75016 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdExReviseCost.java @@ -0,0 +1,44 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + *

+ * 参与外部标准制修订费用统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计") +public class WgdExReviseCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "类型") + private String type; + + @ApiModelProperty(value = "项目编号") + private String proId; + + @ApiModelProperty(value = "项目名称") + private String proName; + + @ApiModelProperty(value = "费用列支项") + private String costOutlay; + + @ApiModelProperty(value = "费用支出") + private BigDecimal cost; + + +} diff --git a/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java new file mode 100644 index 00000000..c43f104f --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/wgdEntity/WgdMeetCost.java @@ -0,0 +1,48 @@ +package com.ydw.bat.wkflow.wgdEntity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 参会费用信息统计 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计") +public class WgdMeetCost { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "主办单位") + private String unit; + + @ApiModelProperty(value = "会议名称") + private String meetName; + + @ApiModelProperty(value = "会议时间") + private LocalDateTime meetTime; + + @ApiModelProperty(value = "会费标准") + private BigDecimal payStandard; + + @ApiModelProperty(value = "实际发生") + private BigDecimal payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + +}