diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index d7ee90bb..dc39c227 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -46,6 +46,11 @@ public class ActDefineStartMap { map.put("18","policyResearchGroupAttendMeeting"); map.put("19","policyResearchGroupAfterMeeting"); + //企标复审流程 + map.put("23","enterpriseBidReviewProcess"); + map.put("24","Aboliish"); + map.put("25","enterpriseStandardSystemRevisionPlan"); + return map.get(type); } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java index 4b39a04b..f961bf6a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java @@ -56,7 +56,7 @@ public class PolicyWorkFlowController { private PolicyWorkFlowService policyWorkFlowService; /** - * 政策征求意见导出 + * 纳入重点问题管控 */ @PostMapping("/enterIssue") @ApiOperation("纳入重点问题管控") diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java index e5db9b02..1f5ecdb7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java @@ -21,9 +21,11 @@ public class PolicyWorkFlowService { public boolean enterIssue(String json){ boolean count=false; //是否成功 JSONObject dataJsonObj = JSONObject.parseObject(json); + JSONObject jsonData = dataJsonObj.getJSONObject("json"); - if ("1".equals(dataJsonObj.getString("department"))) { - JSONArray dataList = dataJsonObj.getJSONArray("dataList"); + + if ("1".equals( jsonData.getString("feedbackDept"))) { + JSONArray dataList = jsonData.getJSONArray("infoTableDatas"); /** * 把json对象转换未实体对象 @@ -31,11 +33,15 @@ public class PolicyWorkFlowService { List data = dataList .stream() .map(jsonObj -> { - BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class); + businessDeptIssue.setLawId(businessDeptIssue.getId()); businessDeptIssue.setId(UUIDUtils.randomUUID20()); + businessDeptIssue.setIsClose("0"); return businessDeptIssue; - }).collect(Collectors.toList()); + }).collect(Collectors.toList()) + .stream() + .filter(item->"1".equals(item.getIsRisk())) + .collect(Collectors.toList()); count=businessDeptIssueService.saveBatch(data); } diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index 5c5bd8cb..34575906 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -49,15 +49,15 @@ public class WaterMarkUtil { // set Transparency PdfGState gs = new PdfGState(); // 设置透明度为0.2 - gs.setFillOpacity(0.4f); + gs.setFillOpacity(0.25f); under.setGState(gs); under.restoreState(); under.beginText(); - under.setFontAndSize(base, 56); + under.setFontAndSize(base, 50); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); - for (int y = 0; y < 10; y++) { - for (int x = 0; x < 8; x++) { + for (int y = 0; y < 5; y++) { + for (int x = 0; x < 10; x++) { // 水印文字成45度角倾斜 under.showTextAligned(Element.ALIGN_LEFT , waterMarkName, 100 + 300 * x, 300 * y, 40); diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 7b241288..85625c89 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -78,6 +78,9 @@ public class WebMvcConfig implements WebMvcConfigurer { // 拆分查看页,导出程序异常 addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportSplitInfoZip"); + //调研流程下载接口 + addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile"); + // //测试接口使用 // addInterceptor.excludePathPatterns("/api/**"); diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 485a213d..bd254d7d 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -61,6 +61,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # 文档存储路径指向 # ============================================== file.path=/usr/laws/file/ +file.split.path=/usr/laws/file/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java new file mode 100644 index 00000000..63852873 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -0,0 +1,78 @@ +package com.adc.da.slrs.esRevisePlan.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 企标制修订计划 前端控制器 + *

+* +* @author zcr +* @since 2021-11-14 +*/ +@RestController +@Api(description = "|EsRevisePlan|") +@RequestMapping("api/esRevisePlan/es-revise-plan") +public class EsRevisePlanController extends BaseController { + + @Autowired + IEsRevisePlanService iEsRevisePlanService; + + @ApiOperation(value = "获取所有企标计划") + @GetMapping("getAllPlans") + public ResponseMessage getAllPlans(EsRevisePlan esRevisePlan){ + List esRevisePlans = iEsRevisePlanService.getAllPlans(esRevisePlan); + PageInfo pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans); + return Result.success(pageInfo); + } + + @ApiOperation(value = "多条件查询企标计划") + @PostMapping("queryAllPlans") + public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ + List esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan); + PageInfo pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans); + return Result.success(pageInfo); + } + + @ApiOperation(value = "获取单个企标计划详情") + @GetMapping("getPlanInfo") + public ResponseMessage getPlanInfo(String id){ + return Result.success(iEsRevisePlanService.getOnePlan(id)); + } + + @ApiOperation(value = "编辑企标计划") + @PostMapping("modPlan") + public ResponseMessage modPlan(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.modPlan(esRevisePlan)); + } + + @ApiOperation(value = "添加企标计划") + @PostMapping("addPlan") + public ResponseMessage addPlan(EsRevisePlan esRevisePlan){ + return Result.success(iEsRevisePlanService.addPlan(esRevisePlan)); + } + + @ApiOperation(value = "删除单个企标计划") + @GetMapping("delPlan") + public ResponseMessage delPlan(String id){ + return Result.success(iEsRevisePlanService.delPlan(id)); + } + + @ApiOperation(value = "批量删除企标计划") + @GetMapping("delPlans") + public ResponseMessage delPlans(String ids){ + return Result.success(iEsRevisePlanService.delPlans(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java new file mode 100644 index 00000000..dee08a19 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.esRevisePlan.dao; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 企标制修订计划 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +public interface EsRevisePlanDao extends BaseMapper { + Integer getTotal(); + Integer getQueryTotal(EsRevisePlan esRevisePlan); + List selectAll(EsRevisePlan esRevisePlan);//查询所有 + List queryAll(EsRevisePlan esRevisePlan);//多条件查询 + EsRevisePlan selectOne(String id);//查询详情 + + int updateOne(EsRevisePlan esRevisePlan);//编辑 + int insertOne(EsRevisePlan esRevisePlan);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java new file mode 100644 index 00000000..93cfa32f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -0,0 +1,60 @@ +package com.adc.da.slrs.esRevisePlan.entity; + +import java.util.Date; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + + +/** + *

+ * 企标制修订计划 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="EsRevisePlan对象", description="企标制修订计划") +public class EsRevisePlan extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "企标名称") + private String esName; + + @ApiModelProperty(value = "计划状态") + private String planStatus; + + @ApiModelProperty(value = "制修订状态") + private String reviseStatus; + + @ApiModelProperty(value = "起草人") + private String drafter; + + @ApiModelProperty(value = "评审责任人") + private String resPerson; + + @ApiModelProperty(value = "工作组组长") + private String wgLeader; + + @ApiModelProperty(value = "计划标准初稿完成时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date draftTime; + + @ApiModelProperty(value = "计划标准发布时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date releaseTime; + + @ApiModelProperty(value = "起草责任单位") + private String unit; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java new file mode 100644 index 00000000..cc5eab90 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.esRevisePlan.service; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 企标制修订计划 服务类 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +public interface IEsRevisePlanService extends IService { + List getAllPlans(EsRevisePlan esRevisePlan);//查询所有 + List queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询 + EsRevisePlan getOnePlan(String id);//查询详情 + + int modPlan(EsRevisePlan esRevisePlan);//编辑 + int addPlan(EsRevisePlan esRevisePlan);//插入 + int delPlan(String id);//删除 + int delPlans(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java new file mode 100644 index 00000000..0e7a4ade --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -0,0 +1,69 @@ +package com.adc.da.slrs.esRevisePlan.service.impl; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 企标制修订计划 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-14 + */ +@Service +public class EsRevisePlanServiceImpl extends ServiceImpl implements IEsRevisePlanService { + + @Autowired + EsRevisePlanDao esRevisePlanDao; + + @Override + public List getAllPlans(EsRevisePlan esRevisePlan) { + Integer count = esRevisePlanDao.getTotal(); + esRevisePlan.getPager().setRowCount(count); + List esRevisePlans = esRevisePlanDao.selectAll(esRevisePlan); + return esRevisePlans; + } + + @Override + public List queryAllPlans(EsRevisePlan esRevisePlan) { + Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan); + esRevisePlan.getPager().setRowCount(count); + List esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); + return esRevisePlans; + } + + @Override + public EsRevisePlan getOnePlan(String id) { + return esRevisePlanDao.selectOne(id); + } + + @Override + public int modPlan(EsRevisePlan esRevisePlan) { + return esRevisePlanDao.updateOne(esRevisePlan); + } + + @Override + public int addPlan(EsRevisePlan esRevisePlan) { + esRevisePlan.setId(UUIDUtils.randomUUID(32)); + return esRevisePlanDao.insertOne(esRevisePlan); + } + + @Override + public int delPlan(String id) { + return esRevisePlanDao.deleteOne(id); + } + + @Override + public int delPlans(String ids) { + String[] str = ids.split(","); + return esRevisePlanDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java index 3d5997dc..7ec0369e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java @@ -55,13 +55,13 @@ public class SapMeetingController extends BaseController { return sapMeetingService.getMeetingsByMonth(date, type); } - @ApiOperation(value = "获取当天") + @ApiOperation(value = "获取当天列表") @GetMapping("/getMeetingsByDate") public List getMeetingsByDate(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date,int type){ return sapMeetingService.getMeetingsByDate(date,type); } - @ApiOperation(value = "插入") + @ApiOperation(value = "插入会议") @PostMapping("/addMeeting") public int addMeeting(@RequestBody SapMeeting sapMeeting){ return sapMeetingService.addMeeting(sapMeeting); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index b3887516..606e6e98 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -86,6 +86,12 @@ public class TsInstitutionController extends BaseController { return tsInstitutionService.getNext(institutionId,userName); } + @ApiOperation("获得下一级的部门和人员") + @GetMapping("/getNextById") + public List getNextById(String ids){ + return tsInstitutionService.getNextById(ids); + } + @ApiOperation("获得第一级部门目录") @GetMapping("/getFirstInstitution") public List getFirstInstitution(){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index bc0b5780..619e6efd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper { */ List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); + List selectNextUserByIds(@Param("ids") List ids); + List selectTreeByIds(@Param("rootIds") List rootIds); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 48d24c8b..892228b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService { */ public List getNext(String institutionId,String userName); + public List getNextById(String ids); + /** * 获得第一级的部门 * @return diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index ce821462..5f117ceb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -216,6 +216,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNextById(String ids){ + List strings=new ArrayList<>(Arrays.asList(ids.split(","))); + List tsUsers=tsInstitutionDao.selectNextUserByIds(strings); + + return tsUsers; + } + public List getFirst(){ //查询第一层机构 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index e8885f95..6d748a48 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -28,7 +28,12 @@ public class IssueTrackController { @ApiOperation("新增重点标准跟踪清单项目") public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){ boolean b = issueTrackService.addIssueTrack(issueTrack); - return Result.success(b); + + if (b){ + return Result.success("200","成功", true); + }else{ + return Result.error("100","数据不能相同", false); + } } @@ -52,6 +57,12 @@ public class IssueTrackController { @ApiOperation("更新重点标准跟踪清单项目") public ResponseMessage updateIssueTrack(@RequestBody IssueTrack issueTrack){ boolean b = issueTrackService.updateIssueTrack(issueTrack); - return Result.success(b); +// return Result.success("200","数据不能相同",false); + + if (b){ + return Result.success("200","成功", true); + }else{ + return Result.error("100","数据不能相同", false); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java index 4794d639..1ee14185 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java @@ -1,7 +1,17 @@ package com.adc.da.slrs.sarIssueTrack.dao; import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack; +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; public interface IssueTrackDao extends BaseMapper { + + + public IPage findPage(IPage page, @Param(value = "pageVo") IssueTrack pageVo); + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java index db9d94e3..3e3a492b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -20,7 +21,17 @@ public class IssueTrack { @TableField("law_id") private String lawId; - @TableField("law_name") + @ApiModelProperty("国内标准库 INLAND" + + "海外标准库 FOREIGN" + + "国内外政策库 FOREIGN_LAWS" + + "企业标准库 BUSINESS_STAND") + @TableField("data_source") + private String dataSource; + + @TableField(exist = false) + private String lawCode; + + @TableField(exist = false) private String lawName; @TableField("product_type") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java index b1a8b700..ab7ddd23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -25,9 +25,20 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("law_id",obj.getLawId()) + .eq("del_flag","0"); + + IssueTrack one = this.getOne(wrapper); + if (one==null){ + return false; + }else { + obj.setId(UUIDUtils.randomUUID20()); + obj.setDelFlag("0"); + return this.save(obj); + } + + } @Override @@ -40,26 +51,7 @@ public class IssueTrackServiceImpl extends ServiceImpl trackPage = new Page<>(objVo.getPage(), objVo.getPageSize()); - QueryWrapper wrapper = new QueryWrapper<>(); - - if (objVo.getPage()!=null && objVo.getPageSize()!=null){ - trackPage=new Page<>(objVo.getPage(),objVo.getPageSize()); - }else { - Integer count = issueTrackDao.selectCount(wrapper); - trackPage=new Page<>(0,count,false); - } - - if (objVo.getLawId()!=null){ - wrapper.like("law_id",objVo.getLawId()); - } - if (objVo.getLawName()!=null){ - wrapper.like("law_name",objVo.getLawName()); - } - if (objVo.getProductType()!=null){ - wrapper.like("product_type",objVo.getProductType()); - } - - trackPage = issueTrackDao.selectPage(trackPage, wrapper); + trackPage = issueTrackDao.findPage(trackPage,objVo); return trackPage; @@ -67,7 +59,16 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("law_id",obj.getLawId()); + IssueTrack one = this.getOne(wrapper); + if (one==null){ + return false; + }else { + obj.setId(UUIDUtils.randomUUID20()); + obj.setDelFlag("0"); + return this.updateById(obj); + } } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 077f5e0f..a2c3cd93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; @@ -100,8 +101,8 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize); + public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, standDTO standDTO){ + IPage list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize, standDTO); // 创建一个新的list集合,用于存储去重后的元素 List listTemp = new ArrayList(); for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index eff55660..73a61e1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -30,4 +30,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStand(); List updateByProjectId(@Param("id")String id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java new file mode 100644 index 00000000..a5e5ea27 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandProjectLibrary.dao; + +import lombok.Data; + +@Data +public class standDTO { + + private String uname; + + private String productLine; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index ccee2c44..e1487e33 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,7 +18,7 @@ public interface SarStandProjectLibraryService { List queryNotMaintenanceProjectsolostar(String type); Map solostar(); List queryById(String id); - IPage queryProjectManager(int current, int pageSize); + IPage queryProjectManager(int current, int pageSize, standDTO standDTO); List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 2553c394..ef5124ef 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; import com.adc.da.ocr.util.UUIDUtils; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; @@ -260,11 +261,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { + public IPage queryProjectManager(int current, int pageSize, standDTO standDTO) { + StringBuilder stringBuilder=new StringBuilder(); + stringBuilder.append("where 1=1 "); + if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){ + stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' "); + } + if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){ + stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' "); + } + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName"); wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" + - " and sar_stand_project_library.product_line IS not NULL"); + " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString()); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java index de432cda..905cb9ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -85,6 +85,10 @@ public class BusinessDeptIssue { @TableField("is_close") private String isClose; + @ExcelIgnore + @TableField("is_risk") + private String isRisk; + @ExcelIgnore @TableField(exist = false) private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index dab9f160..20aeca75 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -42,6 +42,9 @@ public class EarlyWarningEO extends BaseEntity { @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; + @TableField(exist = false) + private Date lastTime; + @TableField("APPLY_TYPE") private String applyType; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 66136d5c..680b2b53 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -53,7 +53,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl{ - QueryWrapper sarStandItemsQueryWrapper = new QueryWrapper<>(); - sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag()); - SarStandItems sarStandItems = new SarStandItems(); - sarStandItems.setStandId(sarFileSplitInfoEO.getStandId()); - sarStandItems.setEditFlag(item.getEditFlag()); - sarStandItems.setItemsName(item.getItemsName()); - sarStandItems.setTermsConditions(item.getItermsConditions()); - sarStandItems.setItemsNum(item.getItemsNum()); - sarStandItems.setId(UUIDUtils.randomUUID20()); - sarStandItems.setFileType(sarFileSplitInfoEO.getFileType()); - ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper); - }); + List sarStandItemList = querySame.stream() + .map(item -> { + SarStandItems sarStandItem = new SarStandItems(); + sarStandItem.setStandId(sarFileSplitInfoEO.getStandId()); + sarStandItem.setEditFlag(item.getEditFlag()); + sarStandItem.setItemsName(item.getItemsName()); + sarStandItem.setTermsConditions(item.getItermsConditions()); + sarStandItem.setItemsNum(item.getItemsNum()); + sarStandItem.setId(UUIDUtils.randomUUID20()); + sarStandItem.setFileType(sarFileSplitInfoEO.getFileType()); + + sarStandItem.setEditFlag(item.getEditFlag()); + return sarStandItem; + }) + .collect(Collectors.toList()); + + ServiceImpl.saveBatch(sarStandItemList); + + +// querySame.forEach(item->{ +// QueryWrapper sarStandItemsQueryWrapper = new QueryWrapper<>(); +// sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag()); +// SarStandItems sarStandItems = new SarStandItems(); +// sarStandItems.setStandId(sarFileSplitInfoEO.getStandId()); +// sarStandItems.setEditFlag(item.getEditFlag()); +// sarStandItems.setItemsName(item.getItemsName()); +// sarStandItems.setTermsConditions(item.getItermsConditions()); +// sarStandItems.setItemsNum(item.getItemsNum()); +// sarStandItems.setId(UUIDUtils.randomUUID20()); +// sarStandItems.setFileType(sarFileSplitInfoEO.getFileType()); +// ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper); +// +// }); //根据标准号查询标准是否存在 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 6c6bf9ca..d2f18ceb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -57,6 +57,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService private IAttFileEOService attFileEOService; @Value("${file.path}") private String filePath;//文件存储路径 + @Value("${file.split.path}") + private String splitFilePath;//拆分图片存储路径 /** * 文件下载路径 */ @@ -480,7 +482,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); - String path = "uploadPath/img/" + imageName; + String path = splitFilePath +"/" + imageName; String imgCon = ""; message.getItemsCondi().add(imgCon); message.setItermsConditions(message.getItermsConditions() + imgCon); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java new file mode 100644 index 00000000..ca9b942d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** + *

+ * 委员信息数据统计 前端控制器 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@RestController +@Api(description = "|WgdCgfy|") +@RequestMapping("api/wgdCensusLeo/wgd-cgfy") +public class WgdCgfyController extends BaseController { + @Autowired + IWgdCgfyService iWgdCgfyService; + + @GetMapping("/getAllCgfys") + public ResponseMessage getAllWgdCgfys(){//查询所有 + return Result.success(iWgdCgfyService.getAllWgdCgfys()); + } + + @ApiOperation("查询") + @GetMapping("/queryAllCgfys") + public ResponseMessage queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询 + List wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy); + PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys); + return Result.success(pageInfo); + } + + @GetMapping("/getCgfyById") + public ResponseMessage getWgdCgfyById(String id) {//查询详情 + return Result.success(iWgdCgfyService.getWgdCgfyById(id)); + } + + @ApiOperation("更新") + @PostMapping("/modCgfy") + ResponseMessage updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑 + return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy)); + } + + @ApiOperation("添加") + @PostMapping("/addCgfy") + ResponseMessage insertWgdCgfy(WgdCgfy WgdCgfy) {//插入 + return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy)); + } + + @PostMapping("/delCgfy") + ResponseMessage deleteWgdCgfy(String id){//删除 + return Result.success(iWgdCgfyService.deleteWgdCgfy(id)); + } + + @ApiOperation("删除") + @PostMapping("/delCgfys") + ResponseMessage deleteWgdCgfys(String ids){//批量删除 + return Result.success(iWgdCgfyService.deleteWgdCgfys(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java new file mode 100644 index 00000000..37873d6f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 翻译费用信息统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdFyfy|") +@RequestMapping("api/wgdCensusLeo/wgd-fyfy") +public class WgdFyfyController extends BaseController { + @Autowired + IWgdFyfyService iWgdFyfyService; + + @GetMapping("/getAllFyfys") + public ResponseMessage getAllWgdFyfys(){//查询所有 + return Result.success(iWgdFyfyService.getAllWgdFyfys()); + } + + @ApiOperation("查询") + @GetMapping("/queryAllFyfys") + public ResponseMessage queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询 + List wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy); + PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys); + return Result.success(pageInfo); + } + + @GetMapping("/getFyfyById") + public ResponseMessage getWgdFyfyById(String id) {//查询详情 + return Result.success(iWgdFyfyService.getWgdFyfyById(id)); + } + + @ApiOperation("更新") + @PostMapping("/modFyfy") + ResponseMessage updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑 + return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy)); + } + + @ApiOperation("添加") + @PostMapping("/addFyfy") + ResponseMessage insertWgdFyfy(WgdFyfy WgdFyfy) {//插入 + return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy)); + } + + @PostMapping("/delFyfy") + ResponseMessage deleteWgdFyfy(String id){//删除 + return Result.success(iWgdFyfyService.deleteWgdFyfy(id)); + } + + @ApiOperation("删除") + @PostMapping("/delFyfys") + ResponseMessage deleteWgdFyfys(String ids){//批量删除 + return Result.success(iWgdFyfyService.deleteWgdFyfys(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java new file mode 100644 index 00000000..51249bbf --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 标准制修订补助资金收支统计收入表 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdSrb|") +@RequestMapping("api/wgdCensusLeo/wgd-srb") +public class WgdSrbController extends BaseController { + @Autowired + IWgdSrbService iWgdSrbService; + + @GetMapping("/getAllSrbs") + public ResponseMessage getAllWgdSrbs(){//查询所有 + return Result.success(iWgdSrbService.getAllWgdSrbs()); + } + + @ApiOperation("查询") + @GetMapping("/queryAllSrbs") + public ResponseMessage queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询 + List wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb); + PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs); + return Result.success(pageInfo); + } + + @GetMapping("/getSrbById") + public ResponseMessage getWgdSrbById(String id) {//查询详情 + return Result.success(iWgdSrbService.getWgdSrbById(id)); + } + + @ApiOperation("更新") + @PostMapping("/modSrb") + ResponseMessage updateWgdSrb(WgdSrb WgdSrb) {//编辑 + return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb)); + } + + @ApiOperation("添加") + @PostMapping("/addSrb") + ResponseMessage insertWgdSrb(WgdSrb WgdSrb) {//插入 + return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb)); + } + + @PostMapping("/delSrb") + ResponseMessage deleteWgdSrb(String id){//删除 + return Result.success(iWgdSrbService.deleteWgdSrb(id)); + } + + @ApiOperation("删除") + @PostMapping("/delSrbs") + ResponseMessage deleteWgdSrbs(String ids){//批量删除 + return Result.success(iWgdSrbService.deleteWgdSrbs(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java new file mode 100644 index 00000000..28694017 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 参与外部协会会议统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdWbtj|") +@RequestMapping("api/wgdCensusLeo/wgd-wbtj") +public class WgdWbtjController extends BaseController { + @Autowired + IWgdWbtjService iWgdWbtjService; + + @GetMapping("/getAllWbtjs") + public ResponseMessage getAllWgdWbtjs(){//查询所有 + return Result.success(iWgdWbtjService.getAllWgdWbtjs()); + } + + @ApiOperation("查询") + @GetMapping("/queryAllWbtjs") + public ResponseMessage queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询 + List wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj); + PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs); + return Result.success(pageInfo); + } + + @GetMapping("/getWbtjById") + public ResponseMessage getWgdWbtjById(String id) {//查询详情 + return Result.success(iWgdWbtjService.getWgdWbtjById(id)); + } + + @ApiOperation("更新") + @PostMapping("/modWbtj") + ResponseMessage updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑 + return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj)); + } + + @ApiOperation("添加") + @PostMapping("/addWbtj") + ResponseMessage insertWgdWbtj(WgdWbtj WgdWbtj) {//插入 + return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj)); + } + + @PostMapping("/delWbtj") + ResponseMessage deleteWgdWbtj(String id){//删除 + return Result.success(iWgdWbtjService.deleteWgdWbtj(id)); + } + + @ApiOperation("删除") + @PostMapping("/delWbtjs") + ResponseMessage deleteWgdWbtjs(String ids){//批量删除 + return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java new file mode 100644 index 00000000..dbb61d9f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 参与外部标准制修订信息统计 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdWbxd|") +@RequestMapping("api/wgdCensusLeo/wgd-wbxd") +public class WgdWbxdController extends BaseController { + @Autowired + IWgdWbxdService iWgdWbxdService; + + @GetMapping("/getAllWbxds") + public ResponseMessage getAllWgdWbxds(){//查询所有 + return Result.success(iWgdWbxdService.getAllWgdWbxds()); + } + + @ApiOperation("查询") + @GetMapping("/queryAllWbxds") + public ResponseMessage queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询 + List wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd); + PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds); + return Result.success(pageInfo); + } + + @GetMapping("/getWbxdById") + public ResponseMessage getWgdWbxdById(String id) {//查询详情 + return Result.success(iWgdWbxdService.getWgdWbxdById(id)); + } + + @ApiOperation("更新") + @PostMapping("/modWbxd") + ResponseMessage updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑 + return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd)); + } + + @ApiOperation("添加") + @PostMapping("/addWbxd") + ResponseMessage insertWgdWbxd(WgdWbxd WgdWbxd) {//插入 + return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd)); + } + + @PostMapping("/delWbxd") + ResponseMessage deleteWgdWbxd(String id){//删除 + return Result.success(iWgdWbxdService.deleteWgdWbxd(id)); + } + + @ApiOperation("删除") + @PostMapping("/delWbxds") + ResponseMessage deleteWgdWbxds(String ids){//批量删除 + return Result.success(iWgdWbxdService.deleteWgdWbxds(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java new file mode 100644 index 00000000..49cbfd3d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusLeo.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 标准制修订补助资金收支统计支出表 前端控制器 + *

+* +* @author super_liu +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdZcb|") +@RequestMapping("api/wgdCensusLeo/wgd-zcb") +public class WgdZcbController extends BaseController { + @Autowired + IWgdZcbService iWgdZcbService; + + @GetMapping("/getAllZcbs") + public ResponseMessage getAllWgdZcbs(){//查询所有 + return Result.success(iWgdZcbService.getAllWgdZcbs()); + } + + @ApiOperation("查询") + @GetMapping("/queryAllZcbs") + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); + PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); + return Result.success(pageInfo); + } + + @GetMapping("/getZcbById") + public ResponseMessage getWgdZcbById(String id) {//查询详情 + return Result.success(iWgdZcbService.getWgdZcbById(id)); + } + + @ApiOperation("更新") + @PostMapping("/modZcb") + ResponseMessage updateWgdZcb(WgdZcb WgdZcb) {//编辑 + return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb)); + } + + @ApiOperation("添加") + @PostMapping("/addZcb") + ResponseMessage insertWgdZcb(WgdZcb WgdZcb) {//插入 + return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb)); + } + + @PostMapping("/delZcb") + ResponseMessage deleteWgdZcb(String id){//删除 + return Result.success(iWgdZcbService.deleteWgdZcb(id)); + } + + @ApiOperation("删除") + @PostMapping("/delZcbs") + ResponseMessage deleteWgdZcbs(String ids){//批量删除 + return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java new file mode 100644 index 00000000..ea2981fd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 采购费用信息统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdCgfyDao extends BaseMapper { + Integer getQueryTotal(WgdCgfy WgdCgfy);//总数 + List selectAll();//查询所有 + List queryAll(WgdCgfy wgdCgfy);//多条件查询 + WgdCgfy selectOne(String id);//查询详情 + + int updateOne(WgdCgfy wgdCgfy);//编辑 + int insertOne(WgdCgfy wgdCgfy);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java new file mode 100644 index 00000000..ca20525c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 翻译费用信息统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdFyfyDao extends BaseMapper { + Integer getQueryTotal(WgdFyfy WgdFyfy);//总数 + + List selectAll();//查询所有 + + List queryAll(WgdFyfy wgdFyfy);//多条件查询 + + WgdFyfy selectOne(String id);//查询详情 + + int updateOne(WgdFyfy wgdFyfy);//编辑 + + int insertOne(WgdFyfy wgdFyfy);//插入 + + int deleteOne(String id);//删除 + + int deleteBatch(String[] ids);//批量删除 +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java new file mode 100644 index 00000000..d3989678 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计收入表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdSrbDao extends BaseMapper { + Integer getQueryTotal(WgdSrb WgdSrb);//总数 + List selectAll();//查询所有 + List queryAll(WgdSrb wgdSrb);//多条件查询 + WgdSrb selectOne(String id);//查询详情 + + int updateOne(WgdSrb wgdSrb);//编辑 + int insertOne(WgdSrb wgdSrb);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java new file mode 100644 index 00000000..14577768 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 参与外部协会会议统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdWbtjDao extends BaseMapper { + Integer getQueryTotal(WgdWbtj WgdWbtj);//总数 + List selectAll();//查询所有 + List queryAll(WgdWbtj wgdWbtj);//多条件查询 + WgdWbtj selectOne(String id);//查询详情 + + int updateOne(WgdWbtj wgdWbtj);//编辑 + int insertOne(WgdWbtj wgdWbtj);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java new file mode 100644 index 00000000..50b4917d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订信息统计 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdWbxdDao extends BaseMapper { + Integer getQueryTotal(WgdWbxd WgdWbxd);//总数 + List selectAll();//查询所有 + List queryAll(WgdWbxd wgdWbxd);//多条件查询 + WgdWbxd selectOne(String id);//查询详情 + + int updateOne(WgdWbxd wgdWbxd);//编辑 + int insertOne(WgdWbxd wgdWbxd);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java new file mode 100644 index 00000000..2af97d73 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusLeo.dao; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计支出表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface WgdZcbDao extends BaseMapper { + Integer getQueryTotal(WgdZcb WgdZcb);//总数 + List selectAll();//查询所有 + List queryAll(WgdZcb wgdZcb);//多条件查询 + WgdZcb selectOne(String id);//查询详情 + + int updateOne(WgdZcb wgdZcb);//编辑 + int insertOne(WgdZcb wgdZcb);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java new file mode 100644 index 00000000..7303343e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java @@ -0,0 +1,48 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; +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-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdCgfy对象", description="采购费用信息统计") +public class WgdCgfy extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准类型") + private String type; + + @ApiModelProperty(value = "标准代号") + private String number; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "页数") + private String pages; + + @ApiModelProperty(value = "费用") + private String cost; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java new file mode 100644 index 00000000..87e4886a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java @@ -0,0 +1,56 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 翻译费用信息统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdFyfy对象", description="翻译费用信息统计") +public class WgdFyfy extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准类型") + private String type; + + @ApiModelProperty(value = "标准代号") + private String number; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "翻译类型") + private String translation; + + @ApiModelProperty(value = "页数") + private String pages; + + @ApiModelProperty(value = "费用") + private String cost; + + @ApiModelProperty(value = "翻译完成时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String time; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java new file mode 100644 index 00000000..ab802653 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 标准制修订补助资金收支统计收入表 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表") +public class WgdSrb extends BasePage { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "标准编号") + private String number; + + @ApiModelProperty(value = "补助来源") + private String source; + + @ApiModelProperty(value = "补助金额") + private String cost; + + @ApiModelProperty(value = "入账时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String time; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java new file mode 100644 index 00000000..6056acc2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java @@ -0,0 +1,73 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.adc.da.base.page.BasePage; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 参与外部协会会议统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计") +public class WgdWbtj extends BasePage { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "主办单位") + private String host; + + @ApiModelProperty(value = "会议名称") + private String meeting; + + @ApiModelProperty(value = "会议时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String time; + + @ApiModelProperty(value = "会议地点") + private String place; + + @ApiModelProperty(value = "会费标准") + private String contributions; + + @ApiModelProperty(value = "会费实际发生") + private String occurs; + + @ApiModelProperty(value = "费用列支") + private String expenses; + + @ApiModelProperty(value = "参会人员") + private String user; + + @ApiModelProperty(value = "主管领导") + private String leadership; + + @ApiModelProperty(value = "参会单位") + private String participants; + + @ApiModelProperty(value = "会议资料") + private String information; + + @ApiModelProperty(value = "会议录音") + private String recording; + + @ApiModelProperty(value = "主要议题") + @TableField("Issues") + private String Issues; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java new file mode 100644 index 00000000..f95a486c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java @@ -0,0 +1,99 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

+ * 参与外部标准制修订信息统计 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计") +public class WgdWbxd extends BasePage { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "所处阶段") + private String stage; + + @ApiModelProperty(value = "标准号") + private String number; + + @ApiModelProperty(value = "标准名称") + private String name; + + @ApiModelProperty(value = "项目代号") + private String projectId; + + @ApiModelProperty(value = "项目名称") + private String projectName; + + @ApiModelProperty(value = "标准类型") + private String type; + + @ApiModelProperty(value = "主持或参与") + private String preside; + + @ApiModelProperty(value = "发布日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String dataStart; + + @ApiModelProperty(value = "实施日期") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String dataImplement; + + @ApiModelProperty(value = "颁布机构") + private String body; + + @ApiModelProperty(value = "牵头起草单位") + private String drafting; + + @ApiModelProperty(value = "备案时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String dataRecord; + + @ApiModelProperty(value = "提报单位名称") + private String report; + + @ApiModelProperty(value = "参与人") + private String participants; + + @ApiModelProperty(value = "署名人") + private String celebrity; + + @ApiModelProperty(value = "制标费用") + private String costMarking; + + @ApiModelProperty(value = "其他费用") + private String costOther; + + @ApiModelProperty(value = "标准制/修订") + private String revised; + + @ApiModelProperty(value = "获奖情况") + private String status; + + @ApiModelProperty(value = "署名排序") + private String signature; + + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java new file mode 100644 index 00000000..a47c4c65 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -0,0 +1,44 @@ +package com.adc.da.slrs.wgdCensusLeo.entity; + +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; + +import com.adc.da.base.page.BasePage; +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-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表") +public class WgdZcb extends BasePage { + + private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "项目名称") + private String name; + + @ApiModelProperty(value = "支出金额") + private String cost; + + @ApiModelProperty(value = "用途") + private String use; + + @ApiModelProperty(value = "详细附件") + private String annex; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java new file mode 100644 index 00000000..df3c5e48 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 采购费用信息统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdCgfyService extends IService { + List getAllWgdCgfys();//查询所有 + List queryAllWgdCgfys(WgdCgfy wgdCgfy);//多条件查询 + WgdCgfy getWgdCgfyById(String id);//查询详情 + + int updateWgdCgfy(WgdCgfy wgdCgfy);//编辑 + int insertWgdCgfy(WgdCgfy wgdCgfy);//插入 + int deleteWgdCgfy(String id);//删除 + int deleteWgdCgfys(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java new file mode 100644 index 00000000..4a16bdf8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 翻译费用信息统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdFyfyService extends IService { + List getAllWgdFyfys();//查询所有 + List queryAllWgdFyfys(WgdFyfy wgdFyfy);//多条件查询 + WgdFyfy getWgdFyfyById(String id);//查询详情 + + int updateWgdFyfy(WgdFyfy wgdFyfy);//编辑 + int insertWgdFyfy(WgdFyfy wgdFyfy);//插入 + int deleteWgdFyfy(String id);//删除 + int deleteWgdFyfys(String ids);//批量删除 +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java new file mode 100644 index 00000000..fcb2c28d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计收入表 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdSrbService extends IService { + List getAllWgdSrbs();//查询所有 + List queryAllWgdSrbs(WgdSrb wgdSrb);//多条件查询 + WgdSrb getWgdSrbById(String id);//查询详情 + + int updateWgdSrb(WgdSrb wgdSrb);//编辑 + int insertWgdSrb(WgdSrb wgdSrb);//插入 + int deleteWgdSrb(String id);//删除 + int deleteWgdSrbs(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java new file mode 100644 index 00000000..80b2505a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 参与外部协会会议统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdWbtjService extends IService { + List getAllWgdWbtjs();//查询所有 + List queryAllWgdWbtjs(WgdWbtj wgdWbtj);//多条件查询 + WgdWbtj getWgdWbtjById(String id);//查询详情 + + int updateWgdWbtj(WgdWbtj wgdWbtj);//编辑 + int insertWgdWbtj(WgdWbtj wgdWbtj);//插入 + int deleteWgdWbtj(String id);//删除 + int deleteWgdWbtjs(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java new file mode 100644 index 00000000..cfc0e862 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订信息统计 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdWbxdService extends IService { + List getAllWgdWbxds();//查询所有 + List queryAllWgdWbxds(WgdWbxd wgdWbxd);//多条件查询 + WgdWbxd getWgdWbxdById(String id);//查询详情 + + int updateWgdWbxd(WgdWbxd wgdWbxd);//编辑 + int insertWgdWbxd(WgdWbxd wgdWbxd);//插入 + int deleteWgdWbxd(String id);//删除 + int deleteWgdWbxds(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java new file mode 100644 index 00000000..505af47a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusLeo.service; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计支出表 服务类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +public interface IWgdZcbService extends IService { + List getAllWgdZcbs();//查询所有 + List queryAllWgdZcbs(WgdZcb wgdZcb);//多条件查询 + WgdZcb getWgdZcbById(String id);//查询详情 + + int updateWgdZcb(WgdZcb wgdZcb);//编辑 + int insertWgdZcb(WgdZcb wgdZcb);//插入 + int deleteWgdZcb(String id);//删除 + int deleteWgdZcbs(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java new file mode 100644 index 00000000..3845fc23 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; +import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import com.adc.da.util.MD5Util; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 采购费用信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdCgfyServiceImpl extends ServiceImpl implements IWgdCgfyService { + + @Autowired + WgdCgfyDao wgdCgfyDao; + + @Override + public List getAllWgdCgfys() { + return wgdCgfyDao.selectAll(); + } + + @Override + public List queryAllWgdCgfys(WgdCgfy wgdCgfy) { + Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy); + wgdCgfy.getPager().setRowCount(count); + return wgdCgfyDao.queryAll(wgdCgfy); + } + + @Override + public WgdCgfy getWgdCgfyById(String id) { + return wgdCgfyDao.selectById(id); + } + + @Override + public int updateWgdCgfy(WgdCgfy wgdCgfy) { + return wgdCgfyDao.updateOne(wgdCgfy); + } + + @Override + public int insertWgdCgfy(WgdCgfy wgdCgfy) { + wgdCgfy.setId(UUIDUtils.randomUUID(32)); + return wgdCgfyDao.insertOne(wgdCgfy); + } + + @Override + public int deleteWgdCgfy(String id) { + return wgdCgfyDao.deleteOne(id); + } + + @Override + public int deleteWgdCgfys(String ids) { + String[] str = ids.split(","); + return wgdCgfyDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java new file mode 100644 index 00000000..9de7a613 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 翻译费用信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdFyfyServiceImpl extends ServiceImpl implements IWgdFyfyService { + + @Autowired + WgdFyfyDao wgdFyfyDao; + + @Override + public List getAllWgdFyfys() { + return wgdFyfyDao.selectAll(); + } + + @Override + public List queryAllWgdFyfys(WgdFyfy wgdFyfy) { + Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy); + wgdFyfy.getPager().setRowCount(count); + return wgdFyfyDao.queryAll(wgdFyfy); + } + + @Override + public WgdFyfy getWgdFyfyById(String id) { + return wgdFyfyDao.selectOne(id); + } + + @Override + public int updateWgdFyfy(WgdFyfy wgdFyfy) { + return wgdFyfyDao.updateOne(wgdFyfy); + } + + @Override + public int insertWgdFyfy(WgdFyfy wgdFyfy) { + wgdFyfy.setId(UUIDUtils.randomUUID(32)); + return wgdFyfyDao.insertOne(wgdFyfy); + } + + @Override + public int deleteWgdFyfy(String id) { + return wgdFyfyDao.deleteOne(id); + } + + @Override + public int deleteWgdFyfys(String ids) { + String[] str = ids.split(","); + return wgdFyfyDao.deleteBatch(str); + } +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java new file mode 100644 index 00000000..44498d8f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计收入表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdSrbServiceImpl extends ServiceImpl implements IWgdSrbService { + + @Autowired + WgdSrbDao wgdSrbDao; + + @Override + public List getAllWgdSrbs() { + return wgdSrbDao.selectAll(); + } + + @Override + public List queryAllWgdSrbs(WgdSrb wgdSrb) { + Integer count = wgdSrbDao.getQueryTotal(wgdSrb); + wgdSrb.getPager().setRowCount(count); + return wgdSrbDao.queryAll(wgdSrb); + } + + @Override + public WgdSrb getWgdSrbById(String id) { + return wgdSrbDao.selectOne(id); + } + + @Override + public int updateWgdSrb(WgdSrb wgdSrb) { + return wgdSrbDao.updateOne(wgdSrb); + } + + @Override + public int insertWgdSrb(WgdSrb wgdSrb) { + wgdSrb.setId(UUIDUtils.randomUUID(32)); + return wgdSrbDao.insertOne(wgdSrb); + } + + @Override + public int deleteWgdSrb(String id) { + return wgdSrbDao.deleteOne(id); + } + + @Override + public int deleteWgdSrbs(String ids) { + String[] str = ids.split(","); + return wgdSrbDao.deleteBatch(str); + } +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java new file mode 100644 index 00000000..123c943c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参与外部协会会议统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdWbtjServiceImpl extends ServiceImpl implements IWgdWbtjService { + + @Autowired + WgdWbtjDao wgdWbtjDao; + + @Override + public List getAllWgdWbtjs() { + return wgdWbtjDao.selectAll(); + } + + @Override + public List queryAllWgdWbtjs(WgdWbtj wgdWbtj) { + Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj); + wgdWbtj.getPager().setRowCount(count); + return wgdWbtjDao.queryAll(wgdWbtj); + } + + @Override + public WgdWbtj getWgdWbtjById(String id) { + return wgdWbtjDao.selectOne(id); + } + + @Override + public int updateWgdWbtj(WgdWbtj wgdWbtj) { + return wgdWbtjDao.updateOne(wgdWbtj); + } + + @Override + public int insertWgdWbtj(WgdWbtj wgdWbtj) { + wgdWbtj.setId(UUIDUtils.randomUUID(32)); + return wgdWbtjDao.insertOne(wgdWbtj); + } + + @Override + public int deleteWgdWbtj(String id) { + return wgdWbtjDao.deleteOne(id); + } + + @Override + public int deleteWgdWbtjs(String ids) { + String[] str = ids.split(","); + return wgdWbtjDao.deleteBatch(str); + } +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java new file mode 100644 index 00000000..74bb2122 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订信息统计 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdWbxdServiceImpl extends ServiceImpl implements IWgdWbxdService { + + @Autowired + WgdWbxdDao wgdWbxdDao; + + @Override + public List getAllWgdWbxds() { + return wgdWbxdDao.selectAll(); + } + + @Override + public List queryAllWgdWbxds(WgdWbxd wgdWbxd) { + Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd); + wgdWbxd.getPager().setRowCount(count); + return wgdWbxdDao.queryAll(wgdWbxd); + } + + @Override + public WgdWbxd getWgdWbxdById(String id) { + return wgdWbxdDao.selectOne(id); + } + + @Override + public int updateWgdWbxd(WgdWbxd wgdWbxd) { + return wgdWbxdDao.updateOne(wgdWbxd); + } + + @Override + public int insertWgdWbxd(WgdWbxd wgdWbxd) { + wgdWbxd.setId(UUIDUtils.randomUUID(32)); + return wgdWbxdDao.insertOne(wgdWbxd); + } + + @Override + public int deleteWgdWbxd(String id) { + return wgdWbxdDao.deleteOne(id); + } + + @Override + public int deleteWgdWbxds(String ids) { + String[] str = ids.split(","); + return wgdWbxdDao.deleteBatch(str); + } +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java new file mode 100644 index 00000000..920d07e9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusLeo.service.impl; + +import com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao; +import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; +import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 标准制修订补助资金收支统计支出表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ +@Service +public class WgdZcbServiceImpl extends ServiceImpl implements IWgdZcbService { + + @Autowired + WgdZcbDao wgdZcbDao; + + @Override + public List getAllWgdZcbs() { + return wgdZcbDao.selectAll(); + } + + @Override + public List queryAllWgdZcbs(WgdZcb wgdZcb) { + Integer count = wgdZcbDao.getQueryTotal(wgdZcb); + wgdZcb.getPager().setRowCount(count); + return wgdZcbDao.queryAll(wgdZcb); + } + + @Override + public WgdZcb getWgdZcbById(String id) { + return wgdZcbDao.selectOne(id); + } + + @Override + public int updateWgdZcb(WgdZcb wgdZcb) { + return wgdZcbDao.updateOne(wgdZcb); + } + + @Override + public int insertWgdZcb(WgdZcb wgdZcb) { + wgdZcb.setId(UUIDUtils.randomUUID(32)); + return wgdZcbDao.insertOne(wgdZcb); + } + + @Override + public int deleteWgdZcb(String id) { + return wgdZcbDao.deleteOne(id); + } + + @Override + public int deleteWgdZcbs(String ids) { + String[] str = ids.split(","); + return wgdZcbDao.deleteBatch(str); + } +} \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java new file mode 100644 index 00000000..09891730 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java @@ -0,0 +1,81 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandItems.entity.SarStandItems; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 协会费用信息统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdAssocCost|") +@RequestMapping("api/wgdCensusZ/wgd-assoc-cost") +public class WgdAssocCostController extends BaseController { + + @Autowired + IWgdAssocCostService iWgdAssocCostService; + + @ApiOperation("查询所有信息") + @GetMapping("getAllAssocCosts") + public ResponseMessage getAllWgdAssocCosts(WgdAssocCost page){//查询所有 + List wgdAssocCosts = iWgdAssocCostService.getAllWgdAssocCosts(page); + PageInfo pageInfo = getPageInfo(page.getPager(), wgdAssocCosts); + return Result.success(pageInfo); + } + + @ApiOperation("多条件查询") + @GetMapping("queryAllAssocCosts") + public ResponseMessage queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询 + List wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost); + PageInfo pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts); + return Result.success(pageInfo); + } + + @ApiOperation("查询详情") + @GetMapping("getAssocCostById") + public ResponseMessage getWgdAssocCostById(String id) {//查询详情 + return Result.success(iWgdAssocCostService.getWgdAssocCostById(id)); + } + + @ApiOperation("编辑") + @PutMapping("modAssocCost") + ResponseMessage updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑 + return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost)); + } + + @ApiOperation("插入") + @PostMapping("addAssocCost") + ResponseMessage insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入 + return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost)); + } + + @ApiOperation("删除") + @GetMapping("delAssocCost") + ResponseMessage deleteWgdAssocCost(String id){//删除 + return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id)); + } + + @ApiOperation("批量删除") + @DeleteMapping("delAssocCosts") + ResponseMessage deleteWgdAssocCosts(String ids){//批量删除 + return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java new file mode 100644 index 00000000..05d0ab24 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 协会信息数据统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdAssocInfo|") +@RequestMapping("api/wgdCensusZ/wgd-assoc-info") +public class WgdAssocInfoController extends BaseController { + @Autowired + IWgdAssocInfoService iWgdAssocInfoService; + + @GetMapping("getAllAssocInfos") + public ResponseMessage getAllWgdAssocInfos(){//查询所有 + return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos()); + } + + @ApiOperation("查询") + @GetMapping("queryAllAssocInfos") + public ResponseMessage queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询 + List wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo); + PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos); + return Result.success(pageInfo); + } + + @GetMapping("getAssocInfoById") + public ResponseMessage getWgdAssocInfoById(String id) {//查询详情 + return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id)); + } + + @ApiOperation("更改") + @PostMapping("modAssocInfo") + ResponseMessage updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑 + return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo)); + } + + @ApiOperation("添加") + @PostMapping("addAssocInfo") + ResponseMessage insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入 + return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo)); + } + + @GetMapping("delAssocInfo") + ResponseMessage deleteWgdAssocInfo(String id){//删除 + return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id)); + } + + @ApiOperation("删除") + @PostMapping("delAssocInfos") + ResponseMessage deleteWgdAssocInfos(String ids){//批量删除 + return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java new file mode 100644 index 00000000..019ab366 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 委员信息数据统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdCommiInfo|") +@RequestMapping("api/wgdCensusZ/wgd-commi-info") +public class WgdCommiInfoController extends BaseController { + @Autowired + IWgdCommiInfoService iWgdCommiInfoService; + + @GetMapping("getAllCommiInfos") + public ResponseMessage getAllWgdCommiInfos(){//查询所有 + return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); + } + + @ApiOperation("查询") + @GetMapping("queryAllCommiInfos") + public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 + List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); + PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos); + return Result.success(pageInfo); + } + + @GetMapping("getCommiInfoById") + public ResponseMessage getWgdCommiInfoById(String id) {//查询详情 + return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id)); + } + + @ApiOperation("更新") + @PostMapping("modCommiInfo") + ResponseMessage updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 + return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo)); + } + + @ApiOperation("添加") + @PostMapping("addCommiInfo") + ResponseMessage insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 + return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo)); + } + + @GetMapping("delCommiInfo") + ResponseMessage deleteWgdCommiInfo(String id){//删除 + return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); + } + + @ApiOperation("删除") + @PostMapping("delCommiInfos") + ResponseMessage deleteWgdCommiInfos(String ids){//批量删除 + return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java new file mode 100644 index 00000000..be484788 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + +import java.util.List; + +/** +*

+ * 参与外部标准制修订费用统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdExReviseCost|") +@RequestMapping("api/wgdCensusZ/wgd-ex-revise-cost") +public class WgdExReviseCostController extends BaseController { + @Autowired + IWgdExReviseCostService iWgdExReviseCostService; + + @GetMapping("getAllExReviseCosts") + public ResponseMessage getAllWgdExReviseCosts(){//查询所有 + return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts()); + } + + @ApiOperation("查询") + @GetMapping("queryAllExReviseCosts") + public ResponseMessage queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询 + List wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost); + PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts); + return Result.success(pageInfo); + } + + @GetMapping("getExReviseCostById") + public ResponseMessage getWgdExReviseCostById(String id) {//查询详情 + return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id)); + } + + @ApiOperation("更改") + @PutMapping("modExReviseCost") + ResponseMessage updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 + return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost)); + } + + @ApiOperation("插入") + @PostMapping("addExReviseCost") + ResponseMessage insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入 + return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost)); + } + + @GetMapping("delExReviseCost") + ResponseMessage deleteWgdExReviseCost(String id){//删除 + return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id)); + } + + @ApiOperation("删除") + @DeleteMapping("delExReviseCosts") + ResponseMessage deleteWgdExReviseCosts(String ids){//批量删除 + return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java new file mode 100644 index 00000000..c6f4a9e2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java @@ -0,0 +1,69 @@ +package com.adc.da.slrs.wgdCensusZ.controller; + + +import com.adc.da.http.PageInfo; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import com.adc.da.base.web.BaseController; + + +/** +*

+ * 参会费用信息统计 前端控制器 + *

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdMeetCost|") +@RequestMapping("api/wgdCensusZ/wgd-meet-cost") +public class WgdMeetCostController extends BaseController { + @Autowired + IWgdMeetCostService iWgdMeetCostService; + + @ApiOperation("查询") + @GetMapping("queryAllMeetCosts") + public ResponseMessage queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询 + PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost)); + return Result.success(pageInfo); + } + + @ApiOperation("更新") + @PutMapping("modMeetCost") + ResponseMessage updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 + return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost)); + } + + @ApiOperation("添加") + @PostMapping("addMeetCost") + ResponseMessage insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入 + return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost)); + } + + @ApiOperation("删除") + @DeleteMapping("delMeetCosts") + ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 + return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); + } + + @GetMapping("getAllMeetCosts") + public ResponseMessage getAllWgdMeetCosts(){//查询所有 + return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); + } + @GetMapping("getMeetCostById") + public ResponseMessage getWgdMeetCostById(String id) {//查询详情 + return Result.success(iWgdMeetCostService.getWgdMeetCostById(id)); + } + @GetMapping("delMeetCost") + ResponseMessage deleteWgdMeetCost(String id){//删除 + return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id)); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java new file mode 100644 index 00000000..e7b19e41 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java @@ -0,0 +1,32 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 协会费用信息统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdAssocCostDao extends BaseMapper { + Integer getTotal();//总数 + Integer getQueryTotal(WgdAssocCost wgdAssocCost);//总数 + List selectAll(WgdAssocCost page);//查询所有 + List queryAll(WgdAssocCost wgdAssocCost);//多条件查询 + WgdAssocCost selectOne(String id);//查询详情 + + int updateOne(WgdAssocCost wgdAssocCost);//编辑 + int insertOne(WgdAssocCost wgdAssocCost);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 + +} + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java new file mode 100644 index 00000000..3491ed99 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 协会信息数据统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdAssocInfoDao extends BaseMapper { + Integer getQueryTotal(WgdAssocInfo WgdAssocInfo);//总数 + List selectAll();//查询所有 + List queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询 + WgdAssocInfo selectOne(String id);//查询详情 + + int updateOne(WgdAssocInfo wgdAssocInfo);//编辑 + int insertOne(WgdAssocInfo wgdAssocInfo);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java new file mode 100644 index 00000000..08aa17eb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 委员信息数据统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdCommiInfoDao extends BaseMapper { + Integer getQueryTotal(WgdCommiInfo WgdCommiInfo);//总数 + List selectAll();//查询所有 + List queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询 + WgdCommiInfo selectOne(String id);//查询详情 + + int updateOne(WgdCommiInfo wgdCommiInfo);//编辑 + int insertOne(WgdCommiInfo wgdCommiInfo);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java new file mode 100644 index 00000000..2fa84fb6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdExReviseCostDao extends BaseMapper { + Integer getQueryTotal(WgdExReviseCost WgdExReviseCost);//总数 + List selectAll();//查询所有 + List queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询 + WgdExReviseCost selectOne(String id);//查询详情 + + int updateOne(WgdExReviseCost wgdExReviseCost);//编辑 + int insertOne(WgdExReviseCost wgdExReviseCost);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java new file mode 100644 index 00000000..d5139ab3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java @@ -0,0 +1,29 @@ +package com.adc.da.slrs.wgdCensusZ.dao; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 参会费用信息统计 Mapper 接口 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface WgdMeetCostDao extends BaseMapper { + Integer getQueryTotal(WgdMeetCost WgdMeetCost);//总数 + List selectAll();//查询所有 + List queryAll(WgdMeetCost wgdMeetCost);//多条件查询 + WgdMeetCost selectOne(String id);//查询详情 + + int updateOne(WgdMeetCost wgdMeetCost);//编辑 + int insertOne(WgdMeetCost wgdMeetCost);//插入 + int deleteOne(String id);//删除 + int deleteBatch(String[] ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java new file mode 100644 index 00000000..741601e9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java @@ -0,0 +1,49 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计") +public class WgdAssocCost extends BasePage { + + 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 payStandard; + + @ApiModelProperty(value = "实际发生") + private String payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "每年缴费情况") + private String annualPayment; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java new file mode 100644 index 00000000..76ccfa35 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java @@ -0,0 +1,145 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import java.util.Date; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计") +public class WgdAssocInfo extends BasePage { + + 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 = "初始入会时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date iniTime; + + @ApiModelProperty(value = "本届入会时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date curTime; + + @ApiModelProperty(value = "费用标准") + private String costStandard; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + @ApiModelProperty(value = "上次缴纳时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date 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 String p17; + + @ApiModelProperty(value = "2018缴费") + private String p18; + + @ApiModelProperty(value = "2019缴费") + private String p19; + + @ApiModelProperty(value = "2020缴费") + private String p20; + + @ApiModelProperty(value = "2021缴费") + private String p21; + + @ApiModelProperty(value = "2022缴费") + private String p22; + + @ApiModelProperty(value = "2023缴费") + private String p23; + + @ApiModelProperty(value = "2024缴费") + private String p24; + + @ApiModelProperty(value = "2025缴费") + private String p25; + + @ApiModelProperty(value = "2026缴费") + private String p26; + + @ApiModelProperty(value = "2027缴费") + private String p27; + + @ApiModelProperty(value = "2028缴费") + private String p28; + + @ApiModelProperty(value = "2029缴费") + private String p29; + + @ApiModelProperty(value = "2030缴费") + private String p30; + + @ApiModelProperty(value = "2031缴费") + private String p31; + + @ApiModelProperty(value = "2032缴费") + private String p32; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java new file mode 100644 index 00000000..40c6d61b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java @@ -0,0 +1,77 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import java.util.Date; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计") +public class WgdCommiInfo extends BasePage { + + 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 = "本届入会时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date 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/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java new file mode 100644 index 00000000..7181ba67 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计") +public class WgdExReviseCost extends BasePage { + + 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 String cost; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java new file mode 100644 index 00000000..7c3d3ca2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java @@ -0,0 +1,50 @@ +package com.adc.da.slrs.wgdCensusZ.entity; + +import java.util.Date; + +import com.adc.da.base.page.BasePage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计") +public class WgdMeetCost extends BasePage { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "主办单位") + private String unit; + + @ApiModelProperty(value = "会议名称") + private String meetName; + + @ApiModelProperty(value = "会议时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date meetTime; + + @ApiModelProperty(value = "会费标准") + private String payStandard; + + @ApiModelProperty(value = "实际发生") + private String payReality; + + @ApiModelProperty(value = "费用列支") + private String costOutlay; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java new file mode 100644 index 00000000..361f468f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java @@ -0,0 +1,28 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 协会费用信息统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdAssocCostService extends IService { + List getAllWgdAssocCosts(WgdAssocCost page);//查询所有 + List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询 + WgdAssocCost getWgdAssocCostById(String id);//查询详情 + + int updateWgdAssocCost(WgdAssocCost wgdAssocCost);//编辑 + int insertWgdAssocCost(WgdAssocCost wgdAssocCost);//插入 + int deleteWgdAssocCost(String id);//删除 + int deleteWgdAssocCosts(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java new file mode 100644 index 00000000..e6d18c29 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 协会信息数据统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdAssocInfoService extends IService { + List getAllWgdAssocInfos();//查询所有 + List queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo);//多条件查询 + WgdAssocInfo getWgdAssocInfoById(String id);//查询详情 + + int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//编辑 + int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//插入 + int deleteWgdAssocInfo(String id);//删除 + int deleteWgdAssocInfos(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java new file mode 100644 index 00000000..292efa56 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 委员信息数据统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdCommiInfoService extends IService { + List getAllWgdCommiInfos();//查询所有 + List queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo);//多条件查询 + WgdCommiInfo getWgdCommiInfoById(String id);//查询详情 + + int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//编辑 + int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//插入 + int deleteWgdCommiInfo(String id);//删除 + int deleteWgdCommiInfos(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java new file mode 100644 index 00000000..14e3ba95 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

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

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdExReviseCostService extends IService { + List getAllWgdExReviseCosts();//查询所有 + List queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost);//多条件查询 + WgdExReviseCost getWgdExReviseCostById(String id);//查询详情 + + int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//编辑 + int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//插入 + int deleteWgdExReviseCost(String id);//删除 + int deleteWgdExReviseCosts(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java new file mode 100644 index 00000000..908def81 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.wgdCensusZ.service; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 参会费用信息统计 服务类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +public interface IWgdMeetCostService extends IService { + List getAllWgdMeetCosts();//查询所有 + List queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost);//多条件查询 + WgdMeetCost getWgdMeetCostById(String id);//查询详情 + + int updateWgdMeetCost(WgdMeetCost wgdMeetCost);//编辑 + int insertWgdMeetCost(WgdMeetCost wgdMeetCost);//插入 + int deleteWgdMeetCost(String id);//删除 + int deleteWgdMeetCosts(String ids);//批量删除 +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java new file mode 100644 index 00000000..0fe20013 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + *

+ * 协会费用信息统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdAssocCostServiceImpl extends ServiceImpl implements IWgdAssocCostService { + + @Autowired + WgdAssocCostDao wgdAssocCostDao; + + @Override + public List getAllWgdAssocCosts(WgdAssocCost page) { + Integer count = wgdAssocCostDao.getTotal(); + page.getPager().setRowCount(count); + List wgdAssocCosts = wgdAssocCostDao.selectAll(page); + return wgdAssocCosts; + } + + @Override + public List queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) { + Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost); + wgdAssocCost.getPager().setRowCount(count); + List wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost); + return wgdAssocCosts; + } + + @Override + public WgdAssocCost getWgdAssocCostById(String id) { + return wgdAssocCostDao.selectOne(id); + } + + @Override + public int updateWgdAssocCost(WgdAssocCost wgdAssocCost) { + return wgdAssocCostDao.updateOne(wgdAssocCost); + } + + @Override + public int insertWgdAssocCost(WgdAssocCost wgdAssocCost) { + wgdAssocCost.setId(UUIDUtils.randomUUID(32)); + return wgdAssocCostDao.insertOne(wgdAssocCost); + } + + @Override + public int deleteWgdAssocCost(String id) { + return wgdAssocCostDao.deleteOne(id); + } + + @Override + public int deleteWgdAssocCosts(String ids) { + String[] str = ids.split(","); + return wgdAssocCostDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java new file mode 100644 index 00000000..e862229c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -0,0 +1,65 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; +import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 协会信息数据统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdAssocInfoServiceImpl extends ServiceImpl implements IWgdAssocInfoService { + + @Autowired + WgdAssocInfoDao wgdAssocInfoDao; + + @Override + public List getAllWgdAssocInfos() { + return wgdAssocInfoDao.selectAll(); + } + + @Override + public List queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) { + Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo); + wgdAssocInfo.getPager().setRowCount(count); + return wgdAssocInfoDao.queryAll(wgdAssocInfo); + } + + @Override + public WgdAssocInfo getWgdAssocInfoById(String id) { + return wgdAssocInfoDao.selectById(id); + } + + @Override + public int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { + return wgdAssocInfoDao.updateOne(wgdAssocInfo); + } + + @Override + public int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo) { + wgdAssocInfo.setId(UUIDUtils.randomUUID(32)); + return wgdAssocInfoDao.insertOne(wgdAssocInfo); + } + + @Override + public int deleteWgdAssocInfo(String id) { + return wgdAssocInfoDao.deleteOne(id); + } + + @Override + public int deleteWgdAssocInfos(String ids) { + String[] str = ids.split(","); + return wgdAssocInfoDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java new file mode 100644 index 00000000..9d322cb3 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java @@ -0,0 +1,68 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; +import com.adc.da.util.MD5Util; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 委员信息数据统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdCommiInfoServiceImpl extends ServiceImpl implements IWgdCommiInfoService { + + @Autowired + WgdCommiInfoDao wgdCommiInfoDao; + + @Override + public List getAllWgdCommiInfos() { + return wgdCommiInfoDao.selectAll(); + } + + @Override + public List queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) { + Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo); + wgdCommiInfo.getPager().setRowCount(count); + return wgdCommiInfoDao.queryAll(wgdCommiInfo); + } + + @Override + public WgdCommiInfo getWgdCommiInfoById(String id) { + return wgdCommiInfoDao.selectById(id); + } + + @Override + public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { + wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); + return wgdCommiInfoDao.updateOne(wgdCommiInfo); + } + + @Override + public int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo) { + wgdCommiInfo.setId(UUIDUtils.randomUUID(32)); + wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword())); + return wgdCommiInfoDao.insertOne(wgdCommiInfo); + } + + @Override + public int deleteWgdCommiInfo(String id) { + return wgdCommiInfoDao.deleteOne(id); + } + + @Override + public int deleteWgdCommiInfos(String ids) { + String[] str = ids.split(","); + return wgdCommiInfoDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java new file mode 100644 index 00000000..c5436a10 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java @@ -0,0 +1,67 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参与外部标准制修订费用统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdExReviseCostServiceImpl extends ServiceImpl implements IWgdExReviseCostService { + + @Autowired + WgdExReviseCostDao wgdExReviseCostDao; + + + @Override + public List getAllWgdExReviseCosts() { + return wgdExReviseCostDao.selectAll(); + } + + @Override + public List queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) { + Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost); + wgdExReviseCost.getPager().setRowCount(count); + return wgdExReviseCostDao.queryAll(wgdExReviseCost); + } + + @Override + public WgdExReviseCost getWgdExReviseCostById(String id) { + return wgdExReviseCostDao.selectById(id); + } + + @Override + public int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { + return wgdExReviseCostDao.updateOne(wgdExReviseCost); + } + + @Override + public int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost) { + wgdExReviseCost.setId(UUIDUtils.randomUUID(32)); + return wgdExReviseCostDao.insertOne(wgdExReviseCost); + } + + @Override + public int deleteWgdExReviseCost(String id) { + return wgdExReviseCostDao.deleteOne(id); + } + + @Override + public int deleteWgdExReviseCosts(String ids) { + String[] str = ids.split(","); + return wgdExReviseCostDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java new file mode 100644 index 00000000..3571a193 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java @@ -0,0 +1,66 @@ +package com.adc.da.slrs.wgdCensusZ.service.impl; + +import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; +import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; +import com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao; +import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; +import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 参会费用信息统计 服务实现类 + *

+ * + * @author zcr + * @since 2021-11-12 + */ +@Service +public class WgdMeetCostServiceImpl extends ServiceImpl implements IWgdMeetCostService { + + @Autowired + WgdMeetCostDao wgdMeetCostDao; + + @Override + public List getAllWgdMeetCosts() { + return wgdMeetCostDao.selectAll(); + } + + @Override + public List queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) { + Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost); + wgdMeetCost.getPager().setRowCount(count); + return wgdMeetCostDao.queryAll(wgdMeetCost); + } + + @Override + public WgdMeetCost getWgdMeetCostById(String id) { + return wgdMeetCostDao.selectById(id); + } + + @Override + public int updateWgdMeetCost(WgdMeetCost wgdMeetCost) { + return wgdMeetCostDao.updateOne(wgdMeetCost); + } + + @Override + public int insertWgdMeetCost(WgdMeetCost wgdMeetCost) { + wgdMeetCost.setId(UUIDUtils.randomUUID(32)); + return wgdMeetCostDao.insertOne(wgdMeetCost); + } + + @Override + public int deleteWgdMeetCost(String id) { + return wgdMeetCostDao.deleteOne(id); + } + + @Override + public int deleteWgdMeetCosts(String ids) { + String[] str = ids.split(","); + return wgdMeetCostDao.deleteBatch(str); + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml new file mode 100644 index 00000000..c73b7f6c --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + issue.id,data_source,law_id,product_type,impl_time,impl_require + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml new file mode 100644 index 00000000..fbf42949 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -0,0 +1,209 @@ + + + + + + LIMIT ${(page-1) * pageSize},${pageSize} + + + + + id, + es_name, + plan_status, + revise_status, + drafter, + res_person, + wg_leader, + draft_time, + release_time, + unit + + + + + + + + + + + + + + + + + + and es_name like concat('%',#{esName},'%') + + + and plan_status = #{planStatus} + + + and revise_status = #{reviseStatus} + + + and drafter = #{drafter} + + + and res_person = #{resPerson} + + + and wg_leader = #{wgLeader} + + + and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d') + + + and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d') + + + and unit like concat('%',#{unit},'%') + + + + + + + + + + + + + + update es_revise_plan + + + id = #{id}, + + + es_name = #{esName}, + + + plan_status = #{planStatus}, + + + revise_status = #{reviseStatus}, + + + drafter = #{drafter}, + + + res_person = #{resPerson}, + + + wg_leader = #{wgLeader}, + + + draft_time = #{draftTime}, + + + release_time = #{releaseTime}, + + + unit = #{unit}, + + + where id = #{id} + + + + insert into es_revise_plan + + + id, + + + es_name, + + + plan_status, + + + revise_status, + + + drafter, + + + res_person, + + + wg_leader, + + + draft_time, + + + release_time, + + + unit, + + + values + + + #{id}, + + + #{esName}, + + + #{planStatus}, + + + #{reviseStatus}, + + + #{drafter}, + + + #{resPerson}, + + + #{wgLeader}, + + + #{draftTime}, + + + #{releaseTime}, + + + #{unit}, + + + + + + delete from es_revise_plan where id = #{id} + + + + delete from es_revise_plan where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index aedae23d..d466c37e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -48,6 +48,22 @@ + + @@ -1034,10 +1037,16 @@ and stand_type = #{standType} - and ((concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', - SAR_STANDARDS_INFO.STAND_YEAR) = ( #{standNumber}) and SAR_STANDARDS_INFO.STAND_YEAR != '') - or (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = ( #{standNumber}) - and SAR_STANDARDS_INFO.STAND_YEAR = '') + and ( + ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%') + and + ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%') + and + ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%') + and + ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%') + and SAR_STANDARDS_INFO.STAND_YEAR = '') ) @@ -1137,8 +1146,7 @@ ${orderByA} ${order1}, - a.issue_time is null - ,a.issue_time desc,a.id + a.STAND_NUMBER ASC,a.STAND_YEAR DESC,a.id + select count(*) from wgd_cgfy + + + + + + + + update wgd_cgfy + + + type = #{type}, + + + number = #{number}, + + + name = #{name}, + + + pages = #{pages}, + + + cost = #{cost}, + + + where id = #{id} + + + + insert into wgd_cgfy + + + id, + + + type, + + + number, + + + name, + + + pages, + + + cost, + + + values + + + #{id}, + + + #{type}, + + + #{number}, + + + #{name}, + + + #{pages}, + + + #{cost}, + + + + + + delete from wgd_cgfy where id = #{id} + + + + delete from wgd_cgfy where id in + + #{id} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml new file mode 100644 index 00000000..c7ec5b23 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml @@ -0,0 +1,154 @@ + + + + + + id,type,number,name,translation,pages,cost,time + + + + + + and id = #{id} + + + and type like concat('%',#{type},'%') + + + and number like concat('%',#{number},'%') + + + and name like concat('%',#{name},'%') + + + and translation like concat('%',#{translation},'%') + + + and pages = #{pages} + + + and cost = #{cost} + + + and time = #{time} + + + + + + + + + + + + + + update wgd_fyfy + + + type = #{type}, + + + number = #{number}, + + + name = #{name}, + + + translation = #{translation}, + + + pages = #{pages}, + + + cost = #{cost}, + + + time = #{time}, + + + where id = #{id} + + + + insert into wgd_fyfy + + + id, + + + type, + + + number, + + + name, + + + translation, + + + pages, + + + cost, + + + time, + + + values + + + #{id}, + + + #{type}, + + + #{number}, + + + #{name}, + + + #{translation}, + + + #{pages}, + + + #{cost}, + + + #{time}, + + + + + + delete from wgd_fyfy where id = #{id} + + + + delete from wgd_fyfy where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml new file mode 100644 index 00000000..4c7f1d5a --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml @@ -0,0 +1,134 @@ + + + + + + id,name,number,source,cost,time + + + + + + and id = #{id} + + + and name like concat('%',#{name},'%') + + + and number like concat('%',#{number},'%') + + + + and source = #{source} + + + and cost = #{cost} + + + and time = #{time} + + + + + + + + + + + + + + update wgd_srb + + + name = #{name}, + + + number = #{number}, + + + + source = #{source}, + + + cost = #{cost}, + + + time = #{time}, + + + where id = #{id} + + + + insert into wgd_srb + + + id, + + + name, + + + number, + + + + source, + + + cost, + + + time, + + + values + + + #{id}, + + + #{name}, + + + #{number}, + + + + #{source}, + + + #{cost}, + + + #{time}, + + + + + + delete from wgd_srb where id = #{id} + + + + delete from wgd_srb where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml new file mode 100644 index 00000000..3cae0025 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml @@ -0,0 +1,226 @@ + + + + + + id,host,meeting,time,place,contributions,occurs,expenses,user,leadership,participants,information,recording,Issues + + + + + + and id = #{id} + + + and host like concat('%',#{host},'%') + + + and meeting like concat('%',#{meeting},'%') + + + and time like concat('%',#{time},'%') + + + and place = #{place} + + + and contributions = #{contributions} + + + and occurs = #{occurs} + + + and expenses = #{expenses} + + + and user = #{user} + + + and leadership = #{leadership} + + + and participants = #{participants} + + + and information = #{information} + + + and recording = #{recording} + + + and Issues = #{Issues} + + + + + + + + + + + + + + update wgd_wbtj + + + host = #{host}, + + + meeting = #{meeting}, + + + time = #{time}, + + + place = #{place}, + + + contributions = #{contributions}, + + + occurs = #{occurs}, + + + expenses = #{expenses}, + + + user = #{user}, + + + leadership = #{leadership}, + + + participants = #{participants}, + + + information = #{information}, + + + recording = #{recording}, + + + Issues = #{Issues}, + + + where id = #{id} + + + + insert into wgd_wbtj + + + id, + + + host, + + + meeting, + + + time, + + + place, + + + contributions, + + + occurs, + + + expenses, + + + user, + + + leadership, + + + participants, + + + information, + + + recording, + + + Issues, + + + values + + + #{id}, + + + #{host}, + + + #{meeting}, + + + #{time}, + + + #{place}, + + + #{contributions}, + + + #{occurs}, + + + #{expenses}, + + + #{user}, + + + #{leadership}, + + + #{participants}, + + + #{information}, + + + #{recording}, + + + #{Issues}, + + + + + + delete from wgd_wbtj where id = #{id} + + + + delete from wgd_wbtj where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml new file mode 100644 index 00000000..3ad98715 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml @@ -0,0 +1,323 @@ + + + + + + id,stage,number,name,project_id,project_name,type,preside,data_start,data_implement,body,drafting,data_record,report,participants,celebrity,cost_marking,cost_other,revised,status,signature,remark + + + + + + and id = #{id} + + + and stage like concat('%',#{stage},'%') + + + and number like concat('%',#{number},'%') + + + and name like concat('%',#{name},'%') + + + and project_id = #{project_id} + + + and project_name = #{project_name} + + + and type = #{type} + + + and preside = #{preside} + + + and data_start = #{data_start} + + + and data_implement = #{data_implement} + + + and body = #{body} + + + and drafting = #{drafting} + + + and data_record = #{data_record} + + + and report = #{report} + + + and participants = #{participants} + + + and celebrity = #{celebrity} + + + and cost_marking = #{cost_marking} + + + and cost_other = #{cost_other} + + + and revised = #{revised} + + + and status = #{status} + + + and signature = #{signature} + + + and remark = #{remark} + + + + + + + + + + + + + + update wgd_wbxd + + + stage = #{stage}, + + + number = #{number}, + + + name = #{name}, + + + project_id = #{project_id}, + + + project_name = #{project_name}, + + + type = #{type}, + + + preside = #{preside}, + + + data_start = #{data_start}, + + + data_implement = #{data_implement}, + + + body = #{body}, + + + drafting = #{drafting}, + + + data_record = #{data_record}, + + + report = #{report}, + + + participants = #{participants}, + + + celebrity = #{celebrity}, + + + cost_marking = #{cost_marking}, + + + cost_other = #{cost_other}, + + + revised = #{revised}, + + + status = #{status}, + + + signature = #{signature}, + + + remark = #{remark}, + + + where id = #{id} + + + + insert into wgd_wbxd + + + id, + + + stage, + + + number, + + + name, + + + project_id, + + + project_name, + + + type, + + + preside, + + + data_start, + + + data_implement, + + + body, + + + drafting, + + + data_record, + + + report, + + + participants, + + + celebrity, + + + cost_marking, + + + cost_other, + + + revised, + + + status, + + + signature, + + + remark, + + + + values + + + #{id}, + + + #{stage}, + + + #{number}, + + + #{name}, + + + #{project_id}, + + + #{project_name}, + + + #{type}, + + + #{preside}, + + + #{data_start}, + + + #{data_implement}, + + + #{body}, + + + #{drafting}, + + + #{data_record}, + + + #{report}, + + + #{participants}, + + + #{celebrity}, + + + #{cost_marking}, + + + #{cost_other}, + + + #{revised}, + + + #{status}, + + + #{signature}, + + + #{remark}, + + + + + + delete from wgd_wbxd where id = #{id} + + + + delete from wgd_wbxd where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml new file mode 100644 index 00000000..51767b4d --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -0,0 +1,122 @@ + + + + + + id,name,cost,use,annex + + + + + + and id = #{id} + + + and name like concat('%',#{name},'%') + + + and cost like concat('%',#{cost},'%') + + + and use like concat('%',#{use},'%') + + + and annex = #{annex} + + + + + + + + + + + + + + + update wgd_zcb + + + name = #{name}, + + + cost = #{cost}, + + + use = #{use}, + + + annex = #{annex}, + + + + where id = #{id} + + + + insert into wgd_zcb + + + id, + + + name, + + + cost, + + + use, + + + annex, + + + + values + + + #{id}, + + + #{name}, + + + #{cost}, + + + #{use}, + + + #{annex}, + + + + + + + delete from wgd_zcb where id = #{id} + + + + delete from wgd_zcb where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml new file mode 100644 index 00000000..6c61b91c --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml @@ -0,0 +1,161 @@ + + + + + + + LIMIT ${(page-1) * pageSize},${pageSize} + + + + + id,sc_name,ssc_name,wg_name,pay_standard,pay_reality,cost_outlay,annual_payment + + + + + + and id = #{id} + + + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) + + + and pay_standard = #{payStandard} + + + and pay_reality = #{payReality} + + + and cost_outlay = #{costOutlay} + + + and annual_payment = #{annualPayment} + + + + + + + + + + + + + + + update wgd_assoc_cost + + + sc_name = #{scName}, + + + ssc_name = #{sscName}, + + + wg_name = #{wgName}, + + + pay_standard = #{payStandard}, + + + pay_reality = #{payReality}, + + + cost_outlay = #{costOutlay}, + + + annual_payment = #{annualPayment}, + + + where id = #{id} + + + + insert into wgd_assoc_cost + + + id, + + + sc_name, + + + ssc_name, + + + wg_name, + + + pay_standard, + + + pay_reality, + + + cost_outlay, + + + annual_payment, + + + values + + + #{id}, + + + #{scName}, + + + #{sscName}, + + + #{wgName}, + + + #{payStandard}, + + + #{payReality}, + + + #{costOutlay}, + + + #{annualPayment}, + + + + + + delete from wgd_assoc_cost where id = #{id} + + + + delete from wgd_assoc_cost where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml new file mode 100644 index 00000000..5d81cb64 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml @@ -0,0 +1,467 @@ + + + + + + + LIMIT ${(page-1) * pageSize},${pageSize} + + + + id,sc_name,ssc_name,wg_name,role,attend,standard,charge,leader,ini_time, + cur_time,cost_standard,cost_outlay,last_pay_time,pay_period,handler, + department,as_proper,as_status,as_contact,tel,mail, + p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32 + + + WHERE 1=1 + + and id = #{id} + + + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) + + + and role = #{role} + + + and attend = #{attend} + + + and standard = #{standard} + + + and charge = #{charge} + + + and leader = #{leader} + + + and DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d') + + + and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d') + + + and cost_standard = #{costStandard} + + + and cost_outlay = #{costOutlay} + + + and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d') + + + and pay_period = #{payPeriod} + + + and handler = #{handler} + + + and department = #{department} + + + and as_proper = #{asProper} + + + and as_status = #{asStatus} + + + and as_contact = #{asContact} + + + and tel = #{tel} + + + and mail = #{mail} + + + + + + + + + + + update wgd_assoc_info + + + sc_name = #{scName}, + + + ssc_name = #{sscName}, + + + wg_name = #{wgName}, + + + role = #{role}, + + + attend = #{attend}, + + + standard = #{standard}, + + + charge = #{charge}, + + + leader = #{leader}, + + + ini_time = #{iniTime}, + + + cur_time = #{curTime}, + + + cost_standard = #{costStandard}, + + + cost_outlay = #{costOutlay}, + + + last_pay_time = #{lastPayTime}, + + + pay_period = #{payPeriod}, + + + handler = #{handler}, + + + department = #{department}, + + + as_proper = #{asProper}, + + + as_status = #{asStatus}, + + + as_contact = #{asContact}, + + + tel = #{tel}, + + + mail = #{mail}, + + + p17 = #{p17}, + + + p18 = #{p18}, + + + p19 = #{p19}, + + + p20 = #{p20}, + + + p21 = #{p21}, + + + p22 = #{p22}, + + + p23 = #{p23}, + + + p24 = #{p24}, + + + p25 = #{p25}, + + + p26 = #{p26}, + + + p27 = #{p27}, + + + p28 = #{p28}, + + + p29 = #{p29}, + + + p30 = #{p30}, + + + p31 = #{p31}, + + + p32 = #{p32}, + + + where id = #{id} + + + + insert into wgd_assoc_info + + + id, + + + sc_name, + + + ssc_name, + + + wg_name, + + + role, + + + attend, + + + standard, + + + charge, + + + leader, + + + ini_time, + + + cur_time, + + + cost_standard, + + + cost_outlay, + + + last_pay_time, + + + pay_period, + + + handler, + + + department, + + + as_proper, + + + as_status, + + + as_contact, + + + tel, + + + mail, + + + p17, + + + p18, + + + p19, + + + p20, + + + p21, + + + p22, + + + p23, + + + p24, + + + p25, + + + p26, + + + p27, + + + p28, + + + p29, + + + p30, + + + p31, + + + p32, + + + values + + + #{id}, + + + #{scName}, + + + #{sscName}, + + + #{wgName}, + + + #{role}, + + + #{attend}, + + + #{standard}, + + + #{charge}, + + + #{leader}, + + + #{iniTime}, + + + #{curTime}, + + + #{costStandard}, + + + #{costOutlay}, + + + #{lastPayTime}, + + + #{payPeriod}, + + + #{handler}, + + + #{department}, + + + #{asProper}, + + + #{asStatus}, + + + #{asContact}, + + + #{tel}, + + + #{mail}, + + + #{p17}, + + + #{p18}, + + + #{p19}, + + + #{p20}, + + + #{p21}, + + + #{p22}, + + + #{p23}, + + + #{p24}, + + + #{p25}, + + + #{p26}, + + + #{p27}, + + + #{p28}, + + + #{p29}, + + + #{p30}, + + + #{p31}, + + + #{p32}, + + + + + delete from wgd_assoc_info where id = #{id} + + + + delete from wgd_assoc_info where id in + + #{id} + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml new file mode 100644 index 00000000..d3708885 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml @@ -0,0 +1,241 @@ + + + + + + LIMIT ${(page-1) * pageSize},${pageSize} + + + + id,unit,sc_name,ssc_name,wg_name,role,attend,cur_time,job,department, + tel,term,certificate,account,password,remark + + + where 1=1 + + and id = #{id} + + + and unit = #{unit} + + + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) + + + and role = #{role} + + + and attend = #{attend} + + + and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d') + + + and job = #{job} + + + and department = #{department} + + + and tel = #{tel} + + + and term = #{term} + + + and certificate = #{certificate} + + + and account = #{account} + + + and remark = #{remark} + + + + + + + + + + update wgd_commi_info + + + unit = #{unit}, + + + sc_name = #{scName}, + + + ssc_name = #{sscName}, + + + wg_name = #{wgName}, + + + role = #{role}, + + + attend = #{attend}, + + + cur_time = #{curTime}, + + + job = #{job}, + + + department = #{department}, + + + tel = #{tel}, + + + term = #{term}, + + + certificate = #{certificate}, + + + account = #{account}, + + + password = #{password}, + + + remark = #{remark}, + + + where id = #{id} + + + insert into wgd_commi_info + + + id, + + + unit, + + + sc_name, + + + ssc_name, + + + wg_name, + + + role, + + + attend, + + + cur_time, + + + job, + + + department, + + + tel, + + + term, + + + certificate, + + + account, + + + password, + + + remark, + + + values + + + #{id}, + + + #{unit}, + + + #{scName}, + + + #{sscName}, + + + #{wgName}, + + + #{role}, + + + #{attend}, + + + #{curTime}, + + + #{job}, + + + #{department}, + + + #{tel}, + + + #{term}, + + + #{certificate}, + + + #{account}, + + + #{password}, + + + #{remark}, + + + + + delete from wgd_commi_info where id = #{id} + + + delete from wgd_commi_info where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml new file mode 100644 index 00000000..f176790c --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml @@ -0,0 +1,124 @@ + + + + + + LIMIT ${(page-1) * pageSize},${pageSize} + + + + id,type,pro_id,pro_name,cost_outlay,cost + + + where 1=1 + + and id = #{id} + + + and type = #{type} + + + and pro_id = #{proId} + + + and pro_name = #{proName} + + + and cost = #{cost} + + + and cost_outlay = #{costOutlay} + + + + + + + + + update wgd_ex_revise_cost + + + type = #{type}, + + + pro_id = #{proId}, + + + pro_name = #{proName}, + + + cost = #{cost}, + + + cost_outlay = #{costOutlay}, + + + where id = #{id} + + + insert into wgd_ex_revise_cost + + + id, + + + type, + + + pro_id, + + + pro_name, + + + cost, + + + cost_outlay, + + + values + + + #{id}, + + + #{type}, + + + #{proId}, + + + #{proName}, + + + #{cost}, + + + #{costOutlay}, + + + + + delete from wgd_ex_revise_cost where id = #{id} + + + delete from wgd_ex_revise_cost where id in + + #{id} + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml new file mode 100644 index 00000000..f948663d --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml @@ -0,0 +1,137 @@ + + + + + + LIMIT ${(page-1) * pageSize},${pageSize} + + + + id,unit,meet_name,meet_time,pay_standard,pay_reality,cost_outlay + + + + where 1=1 + + and id = #{id} + + + and unit = #{unit} + + + and meet_name = #{meetName} + + + and DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d') + + + and pay_standard = #{payStandard} + + + and pay_reality = #{payReality} + + + and cost_outlay = #{costOutlay} + + + + + + + + + update wgd_meet_cost + + + unit = #{unit}, + + + meet_name = #{meetName}, + + + meet_time = #{meetTime}, + + + pay_standard = #{payStandard}, + + + pay_reality = #{payReality}, + + + cost_outlay = #{costOutlay}, + + + where id = #{id} + + + insert into wgd_meet_cost + + + id, + + + unit, + + + meet_name, + + + meet_time, + + + pay_standard, + + + pay_reality, + + + cost_outlay, + + + values + + + #{id}, + + + #{unit}, + + + #{meetName}, + + + #{meetTime}, + + + #{payStandard}, + + + #{payReality}, + + + #{costOutlay}, + + + + + delete from wgd_meet_cost where id = #{id} + + + delete from wgd_meet_cost where id in + + #{id} + + + diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml index 288146c0..9783c087 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml @@ -407,7 +407,7 @@ from TS_DICTIONARY dn LEFT JOIN TS_DICTYPE dt ON dn.ID = dt.DIC_ID where dictionary_code = #{dictionaryCode} AND dn.VALID_FLAG = 0 AND dt.VALID_FLAG = 0 AND dt.parent_id is NULL - order by show_index asc + order by show_index asc ,dt.dic_type_name asc