|
@@ -366,6 +366,45 @@ public class CompanyMemberController {
|
|
|
return msgResult;
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value="批量删除企业人员")
|
|
|
+ @PostMapping("batchDelete")
|
|
|
+ public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,
|
|
|
+ HttpServletRequest request){
|
|
|
+ AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
|
|
|
+
|
|
|
+ MessageResult<Integer> msgResult = new MessageResult<>();
|
|
|
+
|
|
|
+ try {
|
|
|
+ int affectCount = 0;
|
|
|
+
|
|
|
+ for (String id : idList) {
|
|
|
+ CompanyMember companyMember = companyMemberService.get(id);
|
|
|
+ companyMember.setDelFlag(true);
|
|
|
+ companyMember.setUpdateBy(principal.getName());
|
|
|
+ companyMember.setUpdateTime(new Date());
|
|
|
+
|
|
|
+ affectCount += companyMemberService.update(companyMember);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (affectCount > 0) {
|
|
|
+ msgResult.setResult(true);
|
|
|
+ msgResult.setData(affectCount);
|
|
|
+ } else {
|
|
|
+ msgResult.setResult(false);
|
|
|
+ msgResult.setMessage("删除失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ catch(Exception ex){
|
|
|
+ logger.error(ex.getMessage(),ex);
|
|
|
+
|
|
|
+ msgResult.setResult(false);
|
|
|
+ msgResult.setMessage(ex.getMessage());
|
|
|
+ }
|
|
|
+
|
|
|
+ return msgResult;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@ApiOperation(value="删除企业人员")
|
|
|
@PostMapping("delete")
|
|
|
@ApiImplicitParams({
|
|
@@ -430,6 +469,8 @@ public class CompanyMemberController {
|
|
|
|
|
|
List<DataDictionary> ddList = dataDictionaryService.findByCatalogName("证件类型");
|
|
|
|
|
|
+ Date now = new Date();
|
|
|
+
|
|
|
for(int rowIndex=1 ; rowIndex<=sheet1.getLastRowNum(); rowIndex++){
|
|
|
try {
|
|
|
String name = (String)poiUtils.getCellValue(sheetIndex,rowIndex,1);
|
|
@@ -541,7 +582,9 @@ public class CompanyMemberController {
|
|
|
companyMember.setStatus("0");
|
|
|
companyMember.setDelFlag(false);
|
|
|
companyMember.setCreateBy(principal.getName());
|
|
|
- companyMember.setCreateTime(new Date());
|
|
|
+
|
|
|
+ //按照excel导入顺序排序
|
|
|
+ companyMember.setCreateTime(new Date(now.getTime() + (rowIndex-1)*1000));
|
|
|
|
|
|
if (companyMemberService.insert(companyMember) > 0) {
|
|
|
affectCount++;
|