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 05d54412..4b39a04b 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 @@ -1,21 +1,21 @@ package com.adc.da.workFlow.controller; import com.adc.da.common.ReadExcel; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.workFlow.common.ExportExcel; +import com.adc.da.workFlow.service.PolicyWorkFlowService; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.google.gson.JsonObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.stereotype.Controller; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.LinkedHashMap; -import java.util.Map; @RestController @@ -50,4 +50,20 @@ public class PolicyWorkFlowController { } + + + @Autowired + private PolicyWorkFlowService policyWorkFlowService; + + /** + * 政策征求意见导出 + */ + @PostMapping("/enterIssue") + @ApiOperation("纳入重点问题管控") + public ResponseMessage enterIssue(@RequestBody String json){ + boolean result = policyWorkFlowService.enterIssue(json); + + return Result.success(result); + } + } 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 new file mode 100644 index 00000000..e5db9b02 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java @@ -0,0 +1,45 @@ +package com.adc.da.workFlow.service; + +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService; +import com.adc.da.util.UUIDUtils; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class PolicyWorkFlowService { + + @Autowired + private IBusinessDeptIssueService businessDeptIssueService; + + + public boolean enterIssue(String json){ + boolean count=false; //是否成功 + JSONObject dataJsonObj = JSONObject.parseObject(json); + + if ("1".equals(dataJsonObj.getString("department"))) { + JSONArray dataList = dataJsonObj.getJSONArray("dataList"); + + /** + * 把json对象转换未实体对象 + */ + List data = dataList + .stream() + .map(jsonObj -> { + + BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class); + businessDeptIssue.setId(UUIDUtils.randomUUID20()); + return businessDeptIssue; + }).collect(Collectors.toList()); + count=businessDeptIssueService.saveBatch(data); + + } + + return count; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/KeyIssueManagementController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/KeyIssueManagementController.java new file mode 100644 index 00000000..0d0bc370 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/KeyIssueManagementController.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandUnqualified.controller; + +import org.springframework.stereotype.Controller; + +@Controller +public class KeyIssueManagementController { + //TODO zky +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java new file mode 100644 index 00000000..f7e83ff4 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.sarStandUnqualified.dao; + + + +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +public interface BusinessDeptIssueDao extends BaseMapper { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java new file mode 100644 index 00000000..bda88181 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandUnqualified.dao; + +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface ProductDeptIssueDao extends BaseMapper { +} 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 new file mode 100644 index 00000000..8a60ea81 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java @@ -0,0 +1,26 @@ +package com.adc.da.slrs.sarStandUnqualified.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("business_dept_issue") +public class BusinessDeptIssue { + + private String id; + private String lawId; + private String productType; + private Date implTime; + private String implRequire; + private String conformSituation; + private String devScheme; + private Date sopTime; + private String completeSituation; + private String timeoutSituation; + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java new file mode 100644 index 00000000..4013565f --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java @@ -0,0 +1,25 @@ +package com.adc.da.slrs.sarStandUnqualified.entity; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("product_dept_issue") +public class ProductDeptIssue { + + private String id; + private String lawId; + private String productBusiness; + private String platform; + private String pojName; + private String pojDescription; + private String currentNode; + private String conceptualState; + private Date scheduledIssuanceTime; + private String revisedPlan; + private String explanation; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java new file mode 100644 index 00000000..f666a013 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IBusinessDeptIssueService.java @@ -0,0 +1,7 @@ +package com.adc.da.slrs.sarStandUnqualified.service; + +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IBusinessDeptIssueService extends IService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java new file mode 100644 index 00000000..3d87745d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/IProductDeptIssueService.java @@ -0,0 +1,4 @@ +package com.adc.da.slrs.sarStandUnqualified.service; + +public interface IProductDeptIssueService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java new file mode 100644 index 00000000..c83ee8b9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandUnqualified.service.impl; + +import com.adc.da.slrs.sarStandUnqualified.dao.BusinessDeptIssueDao; +import com.adc.da.slrs.sarStandUnqualified.entity.BusinessDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.service.IBusinessDeptIssueService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class BusinessDeptIssueService extends ServiceImpl implements IBusinessDeptIssueService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java new file mode 100644 index 00000000..046c56b1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java @@ -0,0 +1,9 @@ +package com.adc.da.slrs.sarStandUnqualified.service.impl; + +import com.adc.da.slrs.sarStandUnqualified.dao.ProductDeptIssueDao; +import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue; +import com.adc.da.slrs.sarStandUnqualified.service.IProductDeptIssueService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +public class ProductDeptIssueService extends ServiceImpl implements IProductDeptIssueService { +}