diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index fd53ccc8..cdf348f1 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -12,6 +12,7 @@ import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.controller.WorkFlowController; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; @@ -31,6 +32,7 @@ import java.util.List; */ @Component @EnableScheduling +@Slf4j public class ProcessTimer { @Autowired @@ -178,7 +180,7 @@ public class ProcessTimer { busMes.setJson(jsonObject.toJSONString()); busMes.setUserId(jsonObject.getString("revisionId")); Wrapper wrapper=workFlowFeignClient.completeTaskByUserId(busMes); - System.out.println("dasda"); + log.info("政策课题组会后流程已发起"); } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java new file mode 100644 index 00000000..b02ce635 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/controller/WgDeptController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgDept.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgDept.entity.WgDept; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 集团参与情况 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgDept|") +@RequestMapping("/${restPath}/wgDept") +public class WgDeptController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java new file mode 100644 index 00000000..a8477a26 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/dao/WgDeptDao.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgDept.dao; + +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 集团参与情况 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgDeptDao extends BaseMapper { + List researchDatas(@Param(value = "data") String data); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java new file mode 100644 index 00000000..07b6d5b0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/entity/WgDept.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.wgDept.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 集团参与情况 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgDept对象", description="集团参与情况") +@TableName("wg_dept") +public class WgDept extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "我司在工作组排名顺序") + @TableField("dept_order") + private String deptOrder; + + @ApiModelProperty(value = "我司人员") + @TableField("dept_people_id") + private String deptPeopleId; + + @ApiModelProperty(value = "身份") + @TableField("identity") + private String identity; + + @ApiModelProperty(value = "资料") + @TableField("datum") + private String datum; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java new file mode 100644 index 00000000..1974bf96 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/IWgDeptService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgDept.service; + +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 集团参与情况 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgDeptService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java new file mode 100644 index 00000000..71a4fb5a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgDept/service/impl/WgDeptServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgDept.service.impl; + +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgDept.dao.WgDeptDao; +import com.adc.da.slrs.wgDept.service.IWgDeptService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 集团参与情况 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgDeptServiceImpl extends ServiceImpl implements IWgDeptService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java new file mode 100644 index 00000000..89f7579e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/controller/WgMeetingInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgMeetingInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 参会记录及资料 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgMeetingInfo|") +@RequestMapping("/${restPath}/wgMeetingInfo") +public class WgMeetingInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java new file mode 100644 index 00000000..da9b1711 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/dao/WgMeetingInfoDao.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.wgMeetingInfo.dao; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 参会记录及资料 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgMeetingInfoDao extends BaseMapper { + + List researchDatas(@Param(value = "data") String data); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java new file mode 100644 index 00000000..4fa0854a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/entity/WgMeetingInfo.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.wgMeetingInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 参会记录及资料 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgMeetingInfo对象", description="参会记录及资料") +@TableName("wg_meeting_info") +public class WgMeetingInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "参会时间") + @TableField("meeting_time") + private LocalDateTime meetingTime; + + @ApiModelProperty(value = "会议名称") + @TableField("meet_name") + private String meetingName; + + @ApiModelProperty(value = "会议人员") + @TableField("meeting_people") + private String meetingPeople; + + @ApiModelProperty(value = "会议人员名称") + @TableField("meeting_people_name") + private String meetingPeopleName; + + @ApiModelProperty(value = "会议报告") + @TableField("meeting_report") + private String meetingReport; + + @ApiModelProperty(value = "会议资料") + @TableField("meeting_datum") + private String meetingDatum; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java new file mode 100644 index 00000000..2a2e0155 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/IWgMeetingInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgMeetingInfo.service; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 参会记录及资料 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgMeetingInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java new file mode 100644 index 00000000..0cc958d0 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgMeetingInfo/service/impl/WgMeetingInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgMeetingInfo.service.impl; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgMeetingInfo.dao.WgMeetingInfoDao; +import com.adc.da.slrs.wgMeetingInfo.service.IWgMeetingInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 参会记录及资料 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgMeetingInfoServiceImpl extends ServiceImpl implements IWgMeetingInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java new file mode 100644 index 00000000..ee80b7b9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/controller/WgNetInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgNetInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 工作组秘书联系方式 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgNetInfo|") +@RequestMapping("/${restPath}/wgNetInfo") +public class WgNetInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java new file mode 100644 index 00000000..cdcaf3d2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/dao/WgNetInfoDao.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.wgNetInfo.dao; + +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 工作组秘书联系方式 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgNetInfoDao extends BaseMapper { + + List researchDatas(@Param(value = "data") String data); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java new file mode 100644 index 00000000..f36b8e5d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/entity/WgNetInfo.java @@ -0,0 +1,44 @@ +package com.adc.da.slrs.wgNetInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 工作组秘书联系方式 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgNetInfo对象", description="工作组秘书联系方式") +@TableName("wg_net_info") +public class WgNetInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "人员id") + @TableField("net_id") + private String netId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java new file mode 100644 index 00000000..37d60274 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/IWgNetInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgNetInfo.service; + +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 工作组秘书联系方式 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgNetInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java new file mode 100644 index 00000000..2ae5d889 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgNetInfo/service/impl/WgNetInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgNetInfo.service.impl; + +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgNetInfo.dao.WgNetInfoDao; +import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 工作组秘书联系方式 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgNetInfoServiceImpl extends ServiceImpl implements IWgNetInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java new file mode 100644 index 00000000..67f75b81 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/controller/WgPayInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgPayInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 支付信息 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgPayInfo|") +@RequestMapping("/${restPath}/wgPayInfo") +public class WgPayInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java new file mode 100644 index 00000000..c97e3810 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/dao/WgPayInfoDao.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgPayInfo.dao; + +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 支付信息 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgPayInfoDao extends BaseMapper { + List researchDatas(@Param(value = "data") String data); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java new file mode 100644 index 00000000..81876bc2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/entity/WgPayInfo.java @@ -0,0 +1,70 @@ +package com.adc.da.slrs.wgPayInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 支付信息 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgPayInfo对象", description="支付信息") +@TableName("wg_pay_info") +public class WgPayInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + @TableField("wg_id") + private String wgId; + + @ApiModelProperty(value = "价格") + @TableField("price") + private BigDecimal price; + + @ApiModelProperty(value = "年份") + @TableField("year") + private String year; + + @ApiModelProperty(value = "支付状态(0:未支付,1:已支付)") + @TableField("status") + private String status; + + @ApiModelProperty(value = "是否计划内(0:计划内,1:计划外)") + @TableField("inplan") + private String inplan; + + @ApiModelProperty(value = "支付方式") + @TableField("pay_way") + private String payWay; + + @ApiModelProperty(value = "支付资料") + @TableField("pay_datum") + private String payDatum; + + @ApiModelProperty(value = "费用列支") + @TableField("pay_info") + private String payInfo; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java new file mode 100644 index 00000000..ff7d8468 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/IWgPayInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgPayInfo.service; + +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 支付信息 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgPayInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java new file mode 100644 index 00000000..f348bba5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgPayInfo/service/impl/WgPayInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgPayInfo.service.impl; + +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgPayInfo.dao.WgPayInfoDao; +import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 支付信息 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgPayInfoServiceImpl extends ServiceImpl implements IWgPayInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java new file mode 100644 index 00000000..582a41a7 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/controller/WgStandorpolicyInfoController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; + +/** +*

+ * 标准/政策 -信息 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgStandorpolicyInfo|") +@RequestMapping("/${restPath}/wgStandorpolicyInfo") +public class WgStandorpolicyInfoController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java new file mode 100644 index 00000000..16e7d3dd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/dao/WgStandorpolicyInfoDao.java @@ -0,0 +1,22 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.dao; + +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 标准/政策 -信息 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgStandorpolicyInfoDao extends BaseMapper { + + List researchDatas(@Param(value = "data") String data); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java new file mode 100644 index 00000000..cc9ffde9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/entity/WgStandorpolicyInfo.java @@ -0,0 +1,62 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 标准/政策 -信息 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgStandorpolicyInfo对象", description="标准/政策 -信息") +@TableName("wg_standorpolicy_info") +public class WgStandorpolicyInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "工作组id") + private String wgId; + + @ApiModelProperty(value = "政策/标准 类别") + private String categary; + + @ApiModelProperty(value = "政策/标准 编号") + private String number; + + @ApiModelProperty(value = "政策/标准 年份") + private String year; + + @ApiModelProperty(value = "政策标准 名称") + private String name; + + @ApiModelProperty(value = "政策/标准 英文名称") + private String usname; + + @ApiModelProperty(value = "文本状态") + private String status; + + @ApiModelProperty(value = "参与制定情况") + private String joinDevelop; + + @ApiModelProperty(value = "相关材料") + private String netDatum; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java new file mode 100644 index 00000000..e03fb8a5 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/IWgStandorpolicyInfoService.java @@ -0,0 +1,16 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.service; + +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 标准/政策 -信息 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgStandorpolicyInfoService extends IService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java new file mode 100644 index 00000000..3ad3244e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgStandorpolicyInfo/service/impl/WgStandorpolicyInfoServiceImpl.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.wgStandorpolicyInfo.service.impl; + +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.dao.WgStandorpolicyInfoDao; +import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 标准/政策 -信息 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgStandorpolicyInfoServiceImpl extends ServiceImpl implements IWgStandorpolicyInfoService { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java new file mode 100644 index 00000000..34ce0415 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/controller/WgWorkGroupController.java @@ -0,0 +1,68 @@ +package com.adc.da.slrs.wgWorkGroup.controller; + + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 工作组主表 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-04 +*/ +@RestController +@Api(description = "|WgWorkGroup|") +@RequestMapping("/${restPath}/wg_work_group") +public class WgWorkGroupController extends BaseController { + + @Autowired + private IWgWorkGroupService wgWorkGroupService; + + @ApiOperation("添加工作组节点数据") + @PostMapping("/add") + public ResponseMessage addResource(@RequestBody WgWorkGroupDTO wgWorkGroup){ + return Result.success(wgWorkGroupService.saveDatas(wgWorkGroup)); + } + + + @ApiOperation("搜索工作组节点数据") + @GetMapping("/researchData") + public ResponseMessage researchData(@RequestParam(value = "type") String type){ + return Result.success(wgWorkGroupService.researchData(type)); + } + + @ApiOperation("删除工作组节点数据") + @DeleteMapping("/deleteData") + public ResponseMessage deleteData(@Param(value = "id") String id){ + return wgWorkGroupService.deleteData(id); + } + + @ApiOperation("修改工作组节点数据") + @DeleteMapping("/updateData") + public ResponseMessage updateData(@RequestBody WgWorkGroupShowDTO wgWorkGroupShowDTO){ + return wgWorkGroupService.updateData(wgWorkGroupShowDTO); + } + + + + + + + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java new file mode 100644 index 00000000..71a92b11 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/dao/WgWorkGroupDao.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.wgWorkGroup.dao; + +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 工作组主表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface WgWorkGroupDao extends BaseMapper { + + WgWorkGroupShowDTO researchDatas(@Param(value = "data") List wgWorkGroupShowDTOS,@Param(value = "type")String type); + + List researchDownLevel(@Param(value = "data") String data); + + List researchDownCheck(@Param(value = "data") String data,@Param(value = "status")String status); + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java new file mode 100644 index 00000000..113ce616 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroup.java @@ -0,0 +1,78 @@ +package com.adc.da.slrs.wgWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +@TableName("wgWorkGroup") +public class WgWorkGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作组id") + @TableId(value = "id",type = IdType.UUID) + private String id; + + @ApiModelProperty(value = "父级id") + @TableId("pid") + private String pid; + + @ApiModelProperty(value = "编号") + @TableId("number") + private String number; + + @ApiModelProperty(value = "名称") + @TableId("name") + private String name; + + @ApiModelProperty(value = "性质(0:标委会,1:分标委,2:工作组,3:政策)") + @TableId("nature") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + @TableId("status") + private String status; + + @ApiModelProperty(value = "换届时间") + @TableField("change_time") + private LocalDateTime changeTime; + + @ApiModelProperty(value = "标准化工作领域") + @TableField("stander_area") + private String standerArea; + + @ApiModelProperty(value = "备注") + @TableField("mark") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + @TableField("type") + private String types; + + @ApiModelProperty(value = "层级") + @TableField("level") + private String level; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java new file mode 100644 index 00000000..58badaf3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupDTO.java @@ -0,0 +1,87 @@ +package com.adc.da.slrs.wgWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.List; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +public class WgWorkGroupDTO extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作组id") + private String id; + + @ApiModelProperty(value = "父级id") + private String pid; + + @ApiModelProperty(value = "编号") + private String number; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "性质(0:标委会,1:分标委,2:工作组,3:政策)") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + private String status; + + @ApiModelProperty(value = "换届时间") + private LocalDateTime changeTime; + + @ApiModelProperty(value = "标准化工作领域") + private String standerArea; + + @ApiModelProperty(value = "备注") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + private String types; + + @ApiModelProperty(value = "层级") + private String level; + + //支付信息 + List wgPayInfos; + + //标准政策 + List wgStandorpolicyInfos; + + //集团参与情况 + List wgDepts; + + //秘书联系方式 + List wgNetInfos; + + //参会记录及资料 + List wgMeetingInfos; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java new file mode 100644 index 00000000..b66eea02 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/entity/WgWorkGroupShowDTO.java @@ -0,0 +1,85 @@ +package com.adc.da.slrs.wgWorkGroup.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.slrs.wgDept.entity.WgDept; +import com.adc.da.slrs.wgMeetingInfo.entity.WgMeetingInfo; +import com.adc.da.slrs.wgNetInfo.entity.WgNetInfo; +import com.adc.da.slrs.wgPayInfo.entity.WgPayInfo; +import com.adc.da.slrs.wgStandorpolicyInfo.entity.WgStandorpolicyInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +/** + *

+ * 工作组主表 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgWorkGroup对象", description="工作组主表") +public class WgWorkGroupShowDTO extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "工作组id") + private String id; + + @ApiModelProperty(value = "父级id") + private String pid; + + @ApiModelProperty(value = "编号") + private String number; + + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "性质(0:标委会,1:分标委,2:工作组,3:政策)") + private String nature; + + @ApiModelProperty(value = "状态(0:流程中,1:流程已通过)") + private String status; + + @ApiModelProperty(value = "换届时间") + private Date changeTime; + + @ApiModelProperty(value = "标准化工作领域") + private String standerArea; + + @ApiModelProperty(value = "备注") + private String mark; + + @ApiModelProperty(value = "0:标准化流程 1:政策课题组") + private String types; + + private String level; + + //支付信息 + List wgPayInfos; + + //标准政策 + List wgStandorpolicyInfos; + + //集团参与情况 + List wgDepts; + + //秘书联系方式 + List wgNetInfos; + + //参会记录及资料 + List wgMeetingInfos; + + List children; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java new file mode 100644 index 00000000..2ba8030e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/IWgWorkGroupService.java @@ -0,0 +1,31 @@ +package com.adc.da.slrs.wgWorkGroup.service; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 工作组主表 服务类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +public interface IWgWorkGroupService extends IService { + + String saveDatas(WgWorkGroupDTO wgWorkGroupDTO); + + WgWorkGroupShowDTO researchData(String type); + + ResponseMessage deleteData(String id); + + ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO); + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java new file mode 100644 index 00000000..c5087f22 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgWorkGroup/service/impl/WgWorkGroupServiceImpl.java @@ -0,0 +1,137 @@ +package com.adc.da.slrs.wgWorkGroup.service.impl; + +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgDept.service.IWgDeptService; +import com.adc.da.slrs.wgMeetingInfo.service.IWgMeetingInfoService; +import com.adc.da.slrs.wgNetInfo.service.IWgNetInfoService; +import com.adc.da.slrs.wgPayInfo.service.IWgPayInfoService; +import com.adc.da.slrs.wgStandorpolicyInfo.service.IWgStandorpolicyInfoService; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroup; +import com.adc.da.slrs.wgWorkGroup.dao.WgWorkGroupDao; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupDTO; +import com.adc.da.slrs.wgWorkGroup.entity.WgWorkGroupShowDTO; +import com.adc.da.slrs.wgWorkGroup.service.IWgWorkGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + *

+ * 工作组主表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-04 + */ +@Service +public class WgWorkGroupServiceImpl extends ServiceImpl implements IWgWorkGroupService { + + @Autowired + private IWgWorkGroupService wgWorkGroupService; + @Autowired + private IWgDeptService wgDeptService; + @Autowired + private IWgMeetingInfoService wgMeetingInfoService; + @Autowired + private IWgNetInfoService wgNetInfoService; + @Autowired + private IWgPayInfoService wgPayInfoService; + @Autowired + private IWgStandorpolicyInfoService wgStandorpolicyInfoService; + @Autowired + private WgWorkGroupDao wgWorkGroupDao; + + + @Transactional + @Override + public String saveDatas(WgWorkGroupDTO wgWorkGroupDTO) { + WgWorkGroup wgWorkGroup=new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupDTO,wgWorkGroup); + //存储集团参与情况 + boolean flag1=wgDeptService.saveBatch(wgWorkGroupDTO.getWgDepts()); + //存储会议信息 + boolean flag2=wgMeetingInfoService.saveBatch(wgWorkGroupDTO.getWgMeetingInfos()); + //存储秘书联系方式信息 + boolean flag3=wgNetInfoService.saveBatch(wgWorkGroupDTO.getWgNetInfos()); + //支付信息 + boolean flag4=wgPayInfoService.saveBatch(wgWorkGroupDTO.getWgPayInfos()); + //标准政策信息 + boolean flag5=wgStandorpolicyInfoService.saveBatch(wgWorkGroupDTO.getWgStandorpolicyInfos()); + //先存储主数据 + boolean flag6=wgWorkGroupService.save(wgWorkGroup); + if (flag1 && flag2 && flag3 && flag4 && flag5 && flag6 ) { + return "添加成功"; + }else { + return "数据错误,添加失败"; + } + } + + @Override + public WgWorkGroupShowDTO researchData(String type) { + //构建最初的节点 用来向下搜索 + WgWorkGroupShowDTO wgWorkGroupShowDTO=new WgWorkGroupShowDTO(); + wgWorkGroupShowDTO.setId("root"); + wgWorkGroupShowDTO.setTypes(type); + List wgWorkGroupShowDTOS=new ArrayList<>(); + wgWorkGroupShowDTOS.add(wgWorkGroupShowDTO); + return wgWorkGroupDao.researchDatas(wgWorkGroupShowDTOS,type); + } + + @Override + public ResponseMessage deleteData(String id) { + List wgWorkGroupShowDTOS=wgWorkGroupDao.researchDownCheck(id,"1"); + List wgWorkGroups=wgWorkGroupDao.researchDownLevel(id); + if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0 && null!= wgWorkGroups && wgWorkGroups.size()>0){ + return Result.error("该工作组下存在工作组且处在流程中,无法删除"); + } else if (null!=wgWorkGroups && wgWorkGroups.size()>0) { + return Result.error("该工作组下存在工作组,无法删除"); + } else if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0){ + return Result.error("该工作组处在流程中,无法删除"); + }else { + wgWorkGroupService.removeById(id); + Map columnMap = new HashMap<>(); + columnMap.put("wg_id", id); + wgStandorpolicyInfoService.removeByMap(columnMap); + wgPayInfoService.removeByMap(columnMap); + wgNetInfoService.removeByMap(columnMap); + wgMeetingInfoService.removeByMap(columnMap); + wgDeptService.removeByMap(columnMap); + return Result.success("删除成功"); + } + } + + @Override + public ResponseMessage updateData(WgWorkGroupShowDTO wgWorkGroupShowDTO) { + List wgWorkGroupShowDTOS=wgWorkGroupDao.researchDownCheck(wgWorkGroupShowDTO.getId(),"1"); + if (null!=wgWorkGroupShowDTOS && wgWorkGroupShowDTOS.size()>0){ + return Result.error("工作组处在流程中,无法修改"); + }else { + WgWorkGroup wgWorkGroup=new WgWorkGroup(); + BeanUtils.copyProperties(wgWorkGroupShowDTO,wgWorkGroup); + boolean flag1=wgWorkGroupService.updateById(wgWorkGroup); + boolean flag2=wgDeptService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgDepts()); + boolean flag3=wgMeetingInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgMeetingInfos()); + boolean flag4=wgNetInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgNetInfos()); + boolean flag5=wgPayInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgPayInfos()); + boolean flag6=wgStandorpolicyInfoService.saveOrUpdateBatch(wgWorkGroupShowDTO.getWgStandorpolicyInfos()); + if (flag1 && flag2 && flag3 && flag4 && flag5 && flag6){ + return Result.success("更新成功"); + }else { + return Result.error("无法更新"); + } + } + } + + + + + +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml new file mode 100644 index 00000000..619b63a0 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgDept/WgDeptMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml new file mode 100644 index 00000000..986f3f0c --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgMeetingInfo/WgMeetingInfoMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml new file mode 100644 index 00000000..f6322188 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgNetInfo/WgNetInfoMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml new file mode 100644 index 00000000..18d982b1 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgPayInfo/WgPayInfoMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml new file mode 100644 index 00000000..636a0b83 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgStandorpolicyInfo/WgStandorpolicyInfoMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml new file mode 100644 index 00000000..9256d02a --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wg_work_group/WgWorkGroupMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +