|
|
@@ -11,6 +11,7 @@ import com.qdport.modules.system.entity.SysUser;
|
|
|
import com.qdport.modules.system.service.TSysUserService;
|
|
|
import com.qdport.service.PolicyShareService;
|
|
|
import com.qdport.service.PolicyStriveService;
|
|
|
+import com.qdport.service.impl.PolicySystemService;
|
|
|
import com.qdport.util.ExcelUtil;
|
|
|
import com.qdport.util.HttpsUtil;
|
|
|
import com.qdport.util.StringUtil;
|
|
|
@@ -20,7 +21,6 @@ import com.qdport.vo.PolicyStriveExcelVO;
|
|
|
import com.qdport.vo.PolicyStriveVO;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import lombok.AllArgsConstructor;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
@@ -31,6 +31,7 @@ import javax.annotation.Resource;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@@ -43,6 +44,8 @@ public class ImportDataController {
|
|
|
private PolicyStriveService policyStriveService;
|
|
|
@Resource
|
|
|
private TSysUserService sysUserService;
|
|
|
+ @Resource
|
|
|
+ private PolicySystemService policySystemService;
|
|
|
|
|
|
|
|
|
@PostMapping("/policyShare")
|
|
|
@@ -71,6 +74,10 @@ public class ImportDataController {
|
|
|
shareVO.setUpdateId(Long.valueOf(createUser.getId()));
|
|
|
shareVO.setCreateName(createUser.getName());
|
|
|
|
|
|
+ Map<String, String> map = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
|
|
|
+ shareVO.setDeptId(Long.valueOf(map.get("deptId")));
|
|
|
+ shareVO.setCompanyId(Long.valueOf(map.get("companyId")));
|
|
|
+
|
|
|
policyShareService.save(shareVO);
|
|
|
} catch (Exception e) {
|
|
|
excelVOList.add(model);
|
|
|
@@ -108,6 +115,10 @@ public class ImportDataController {
|
|
|
striveVO.setUpdateId(Long.valueOf(createUser.getId()));
|
|
|
striveVO.setCreateName(createUser.getName());
|
|
|
|
|
|
+ Map<String, String> map = policySystemService.getDeptNameAndCompanyName(createUser.getDeptId());
|
|
|
+ striveVO.setDeptId(Long.valueOf(map.get("deptId")));
|
|
|
+ striveVO.setCompanyId(Long.valueOf(map.get("companyId")));
|
|
|
+
|
|
|
policyStriveService.save(striveVO);
|
|
|
} catch (Exception e) {
|
|
|
excelVOList.add(model);
|