上报分公司

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -169,6 +169,22 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         queryWrapper.orderByDesc("create_time");
         Page<BusinessReminderCard> page = new Page<>(pageNo, pageSize);
         IPage<BusinessReminderCard> pageList = businessReminderCardService.page(page, queryWrapper);
+        List<Map<String, String>> orgName = businessReminderCardService.getOrgName();
+        Map<String, Map<String, String>> orgCode = orgName.stream().collect(Collectors.toMap(v -> v.get("orgCode"), Function.identity(), (o, n) -> o));
+        List<BusinessReminderCard> records = pageList.getRecords();
+        for (BusinessReminderCard record : records) {
+            Map<String, String> stringStringMap = orgCode.get(record.getSysOrgCode().substring(0, 3));
+            Map<String, String> stringString = orgCode.get(record.getSysOrgCode());
+            // 0 当前处理部门     1 一上报分公司   2 已完成
+            if (record.getStatus()!=null && record.getStatus().equals("0")){
+                record.setCurrentDept(stringString.get("departName"));
+            }else if (record.getStatus()!=null && record.getStatus().equals("1")){
+                record.setCurrentDept("已上报"+stringStringMap.get("departName"));
+            }else if (record.getStatus()!=null && record.getStatus().equals("2")){
+                record.setCurrentDept("已完成");
+            }
+
+        }
         return Result.OK(pageList);
     }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCard.java

@@ -218,4 +218,7 @@ public class BusinessReminderCard {
     @ApiModelProperty(value = "上报时间")
     @Excel(name = "上报时间", width = 15)
     private Date upTime;
+
+
+    private String currentDept;
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCardVo.java

@@ -215,6 +215,9 @@ public class BusinessReminderCardVo {
     private String current;
     @Excel(name = "上报状态", width = 15)
     private String upStatus;
+    @ApiModelProperty(value = "当前处理部门")
+    @Excel(name = "当前处理部门", width = 15)
+    private String currentDept;
 
 
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/BusinessReminderCardMapper.java

@@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
-import org.jeecg.modules.smscheck.entity.SmcLotCheckLog;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 入网信息表数据层
@@ -14,8 +16,10 @@ import org.jeecg.modules.smscheck.entity.SmcLotCheckLog;
 public interface BusinessReminderCardMapper  extends BaseMapper<BusinessReminderCard> {
 
 
-    @Select({"select depart_name from sys_depart where org_code = #{orgCode}"})
+    @Select({"select depart_name from sys_depart where org_code = #{orgCode} and  del_flag =0 "})
     String  queryBusinessAddress(@Param("orgCode") String orgCode );
 
 
+    @Select({"select org_code orgCode,depart_name departName    from sys_depart where   del_flag =0 "})
+    List<Map<String,String>>  getOrgName();
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/BusinessReminderCardService.java

@@ -5,10 +5,12 @@ import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
 import org.jeecg.modules.smscheck.entity.SmcLotCheckLog;
 
 import java.util.List;
+import java.util.Map;
 
 public interface BusinessReminderCardService extends IService<BusinessReminderCard> {
 
      String  getBusinessAddress(String ogCode);
 
 
+     List<Map<String,String>> getOrgName();
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/BusinessReminderCardServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 入网信息业务层
@@ -23,4 +24,10 @@ public class BusinessReminderCardServiceImpl extends ServiceImpl<BusinessReminde
 
         return businessReminderCardMapper.queryBusinessAddress(orgCode);
     }
+
+    @Override
+    public List<Map<String, String>> getOrgName() {
+
+        return businessReminderCardMapper.getOrgName();
+    }
 }

tnc-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -106,7 +106,6 @@ public class LoginController {
 			result.error500("用户名或密码错误");
 			return result;
 		}
-				
 		//用户登录信息
 		userInfo(sysUser, result);
 		//update-begin--Author:liusq  Date:20210126  for：登录成功，删除redis中的验证码
@@ -119,6 +118,18 @@ public class LoginController {
 		return result;
 	}
 
+	@RequestMapping(value = "/loginFirst", method = RequestMethod.GET)
+	public Result<?> login(){
+		LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+
+		LoginUser sysUserOne = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		queryWrapper.eq(SysUser::getUsername,sysUserOne.getUsername());
+		SysUser sysUser = sysUserService.getOne(queryWrapper);
+		if (sysUser.getUpdateTime()==null  ){
+			return Result.error("首次登录 请先修改密码...");
+		}
+		return Result.ok();
+	}
 
 	/**
 	 * 【vue3专用】获取用户信息