Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java

@@ -9,6 +9,7 @@ import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration;
+import com.ningdatech.pmapi.projectlib.model.po.ProjectRenewalFundDeclarationPO;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectRenewalFundDeclarationVO;
 import com.ningdatech.pmapi.projectlib.service.IProjectRenewalFundDeclarationService;
@@ -44,7 +45,7 @@ public class ProjectRenewalFundManage {
      * @return
      */
     public PageVo<ProjectRenewalFundDeclarationVO> list(ProjectRenewalListReq req) {
-        Page<ProjectRenewalFundDeclaration> page = req.page();
+        Page<ProjectRenewalFundDeclarationPO> page = req.page();
         projectRenewalFundDeclarationService.pageSql(page, req);
         long total;
         if ((total = page.getTotal()) == 0) {
@@ -81,6 +82,7 @@ public class ProjectRenewalFundManage {
         vo.setProjectType(project.getProjectType());
         vo.setStage(project.getStage());
         vo.setStatus(project.getStatus());
+        vo.setBuildOrgName(project.getBuildOrgName());
         return vo;
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.java

@@ -17,5 +17,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProjectRenewalFundDeclarationMapper extends BaseMapper<ProjectRenewalFundDeclaration> {
 
-    Page<ProjectRenewalFundDeclarationPO> pageSql(Page<ProjectRenewalFundDeclaration> page,@Param("param") ProjectRenewalListReq req);
+    Page<ProjectRenewalFundDeclarationPO> pageSql(Page<ProjectRenewalFundDeclarationPO> page,@Param("param") ProjectRenewalListReq req);
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml

@@ -10,7 +10,7 @@
             prfd.project_year,prfd.annual_payment_amount,prfd.have_amount,
             prfd.gov_own_finance_amount,prfd.gov_superior_finance_amount,
             prfd.bank_lending_amount,prfd.other_amount,prfd.approval_status,prfd.deleted,
-            p.project_type
+            p.project_type,p.project_name,p.build_org_name
         from nd_project_renewal_fund_declaration prfd
         left join nd_project p on prfd.project_id = p.id
         where prfd.deleted = false

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/po/ProjectRenewalFundDeclarationPO.java

@@ -40,6 +40,9 @@ public class ProjectRenewalFundDeclarationPO implements Serializable {
     @ApiModelProperty("项目年份")
     private Integer projectYear;
 
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
     @ApiModelProperty("年度支付金额")
     private BigDecimal annualPaymentAmount;
 
@@ -70,6 +73,9 @@ public class ProjectRenewalFundDeclarationPO implements Serializable {
     @ApiModelProperty("项目类型")
     private Integer projectType;
 
+    @ApiModelProperty("建设单位名称")
+    private String buildOrgName;
+
     @ApiModelProperty("是否删除 false未删 true已删")
     private Boolean deleted;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectRenewalFundDeclarationVO.java

@@ -79,6 +79,9 @@ public class ProjectRenewalFundDeclarationVO implements Serializable {
     @ApiModelProperty("关联项目名字")
     private String projectName;
 
+    @ApiModelProperty("建设单位名称")
+    private String buildOrgName;
+
     @ApiModelProperty("项目类型 1建设 2运维")
     private Integer projectType;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/IProjectRenewalFundDeclarationService.java

@@ -16,5 +16,5 @@ import com.ningdatech.pmapi.projectlib.model.req.ProjectRenewalListReq;
  */
 public interface IProjectRenewalFundDeclarationService extends IService<ProjectRenewalFundDeclaration> {
 
-    Page<ProjectRenewalFundDeclarationPO> pageSql(Page<ProjectRenewalFundDeclaration> page, ProjectRenewalListReq req);
+    Page<ProjectRenewalFundDeclarationPO> pageSql(Page<ProjectRenewalFundDeclarationPO> page, ProjectRenewalListReq req);
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectRenewalFundDeclarationServiceImpl.java

@@ -25,7 +25,7 @@ public class ProjectRenewalFundDeclarationServiceImpl extends
 
     private final ProjectRenewalFundDeclarationMapper mapper;
     @Override
-    public Page<ProjectRenewalFundDeclarationPO> pageSql(Page<ProjectRenewalFundDeclaration> page, ProjectRenewalListReq req) {
+    public Page<ProjectRenewalFundDeclarationPO> pageSql(Page<ProjectRenewalFundDeclarationPO> page, ProjectRenewalListReq req) {
         return mapper.pageSql(page,req);
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java

@@ -45,18 +45,26 @@ public class UserAuthLoginManage {
      * @return
      */
     public UserFullInfoDTO queryUserInfoInPhoneNoAuth(String phoneNo) {
-        UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class)
-                .eq(UserInfo::getMobile, phoneNo));
-        if (Objects.isNull(userInfo)) {
-            return null;
-        }
+//        UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class)
+//                .eq(UserInfo::getMobile, phoneNo));
+//        if (Objects.isNull(userInfo)) {
+//            return null;
+//        }
+//
+//        UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO();
+//        userFullInfoDTO.setCompanyId(1L);
+//        userFullInfoDTO.setUserId(userInfo.getId());
+//        userFullInfoDTO.setIdentifier(userInfo.getRealName());
+//        userFullInfoDTO.setRealName(userInfo.getRealName());
+//        userFullInfoDTO.setUsername(userInfo.getRealName());
+//        return userFullInfoDTO;
 
         UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO();
         userFullInfoDTO.setCompanyId(1L);
-        userFullInfoDTO.setUserId(userInfo.getId());
-        userFullInfoDTO.setIdentifier(userInfo.getRealName());
-        userFullInfoDTO.setRealName(userInfo.getRealName());
-        userFullInfoDTO.setUsername(userInfo.getRealName());
+        userFullInfoDTO.setUserId(1L);
+        userFullInfoDTO.setIdentifier("123456");
+        userFullInfoDTO.setRealName("测试账号");
+        userFullInfoDTO.setUsername("测试账号");
         return userFullInfoDTO;
     }
 
@@ -67,17 +75,25 @@ public class UserAuthLoginManage {
      * @return
      */
     public UserFullInfoDTO queryUserInfoInAccountIdAuth(String accountId) {
-        UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class)
-                .eq(UserInfo::getAccountId, accountId));
-        if (Objects.isNull(userInfo)) {
-            return null;
-        }
+//        UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class)
+//                .eq(UserInfo::getAccountId, accountId));
+//        if (Objects.isNull(userInfo)) {
+//            return null;
+//        }
+//        UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO();
+//        userFullInfoDTO.setCompanyId(1L);
+//        userFullInfoDTO.setUserId(userInfo.getId());
+//        userFullInfoDTO.setIdentifier(userInfo.getRealName());
+//        userFullInfoDTO.setRealName(userInfo.getRealName());
+//        userFullInfoDTO.setUsername(userInfo.getRealName());
+//        return userFullInfoDTO;
+
         UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO();
         userFullInfoDTO.setCompanyId(1L);
-        userFullInfoDTO.setUserId(userInfo.getId());
-        userFullInfoDTO.setIdentifier(userInfo.getRealName());
-        userFullInfoDTO.setRealName(userInfo.getRealName());
-        userFullInfoDTO.setUsername(userInfo.getRealName());
+        userFullInfoDTO.setUserId(1L);
+        userFullInfoDTO.setIdentifier("123456");
+        userFullInfoDTO.setRealName("测试账号");
+        userFullInfoDTO.setUsername("测试账号");
         return userFullInfoDTO;
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/credential/CredentialAuthProvider.java

@@ -58,12 +58,14 @@ public class CredentialAuthProvider implements AuthenticationProvider {
             }
             break;
             case USERNAME_PASSWORD_LOGIN: {
-                user = userDetailsService.loadUserByUsername((String) authenticationToken.getPrincipal());
-                if (user == null) {
-                    throw new InternalAuthenticationServiceException("can not get user info!");
-                }
-                // 账号密码登陆 更改
-                additionalAuthenticationChecks(user, authenticationToken);
+                user = userDetailsService.loadUserByUsername(principal + UserDeatilsServiceConstant.USER_DETAILS_SERVICE_SEPARATOR + loginTypeEnum.name());
+                // TODO 校验测试环境关闭登陆校验
+
+                //                if (user == null) {
+//                    throw new InternalAuthenticationServiceException("can not get user info!");
+//                }
+//                // 账号密码登陆 更改
+//                additionalAuthenticationChecks(user, authenticationToken);
             }
             break;
         }