diff --git a/research-generator/src/main/resources/mbg.xml b/research-generator/src/main/resources/mbg.xml
index bb9127e1..0e8fe468 100644
--- a/research-generator/src/main/resources/mbg.xml
+++ b/research-generator/src/main/resources/mbg.xml
@@ -66,16 +66,16 @@
-
+
-
+
-
+
diff --git a/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProjInfoDto.java b/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProjInfoDto.java
index a369baf2..7c2f4766 100644
--- a/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProjInfoDto.java
+++ b/research-system/src/main/java/com/research/system/domain/dto/ClientPrjProjInfoDto.java
@@ -108,6 +108,25 @@ public class ClientPrjProjInfoDto {
private Integer jscgzh;
private Integer xsjl;
+
+ private Integer xslwNum;
+
+ private Integer zlsqysqNum;
+
+ private Integer rjzzqNum;
+
+ private Integer xszzNum;
+
+ private Integer bzzdNum;
+
+ private Integer ysktNum;
+
+ private Integer jscgzhNum;
+
+ private Integer xsjlNum;
+
+ private String contactName;
+ private String contactPhone;
}
@Data
diff --git a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java
index c7104ce4..f51a4bdc 100644
--- a/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java
+++ b/research-system/src/main/java/com/research/system/domain/dto/GroupDto.java
@@ -59,6 +59,10 @@ public class GroupDto {
private String intro;
private Byte ktGroupStatus;
+ @ApiModelProperty("负责人手机号")
+ private String phone;
+ @ApiModelProperty("负责人")
+ private String name;
}
@Data
diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroup.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroup.java
index 0b202e02..3d941050 100644
--- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroup.java
+++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroup.java
@@ -32,6 +32,10 @@ public class KtsKtGroup implements Serializable {
private String remark;
+ private String name;
+
+ private String phone;
+
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -146,6 +150,22 @@ public class KtsKtGroup implements Serializable {
this.remark = remark == null ? null : remark.trim();
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name == null ? null : name.trim();
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone == null ? null : phone.trim();
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -166,6 +186,8 @@ public class KtsKtGroup implements Serializable {
sb.append(", updateBy=").append(updateBy);
sb.append(", updateTime=").append(updateTime);
sb.append(", remark=").append(remark);
+ sb.append(", name=").append(name);
+ sb.append(", phone=").append(phone);
sb.append("]");
return sb.toString();
}
diff --git a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupExample.java b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupExample.java
index 7102b60f..50038519 100644
--- a/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupExample.java
+++ b/research-system/src/main/java/com/research/system/domain/po/KtsKtGroupExample.java
@@ -994,6 +994,146 @@ public class KtsKtGroupExample {
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
+
+ public Criteria andNameIsNull() {
+ addCriterion("name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIsNotNull() {
+ addCriterion("name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameEqualTo(String value) {
+ addCriterion("name =", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotEqualTo(String value) {
+ addCriterion("name <>", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThan(String value) {
+ addCriterion("name >", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameGreaterThanOrEqualTo(String value) {
+ addCriterion("name >=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThan(String value) {
+ addCriterion("name <", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLessThanOrEqualTo(String value) {
+ addCriterion("name <=", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameLike(String value) {
+ addCriterion("name like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotLike(String value) {
+ addCriterion("name not like", value, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameIn(List values) {
+ addCriterion("name in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotIn(List values) {
+ addCriterion("name not in", values, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameBetween(String value1, String value2) {
+ addCriterion("name between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andNameNotBetween(String value1, String value2) {
+ addCriterion("name not between", value1, value2, "name");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneIsNull() {
+ addCriterion("phone is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneIsNotNull() {
+ addCriterion("phone is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneEqualTo(String value) {
+ addCriterion("phone =", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneNotEqualTo(String value) {
+ addCriterion("phone <>", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneGreaterThan(String value) {
+ addCriterion("phone >", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneGreaterThanOrEqualTo(String value) {
+ addCriterion("phone >=", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneLessThan(String value) {
+ addCriterion("phone <", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneLessThanOrEqualTo(String value) {
+ addCriterion("phone <=", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneLike(String value) {
+ addCriterion("phone like", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneNotLike(String value) {
+ addCriterion("phone not like", value, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneIn(List values) {
+ addCriterion("phone in", values, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneNotIn(List values) {
+ addCriterion("phone not in", values, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneBetween(String value1, String value2) {
+ addCriterion("phone between", value1, value2, "phone");
+ return (Criteria) this;
+ }
+
+ public Criteria andPhoneNotBetween(String value1, String value2) {
+ addCriterion("phone not between", value1, value2, "phone");
+ return (Criteria) this;
+ }
}
public static class Criteria extends GeneratedCriteria {
diff --git a/research-system/src/main/java/com/research/system/domain/po/PrjProjOrg.java b/research-system/src/main/java/com/research/system/domain/po/PrjProjOrg.java
index 76c0c1f4..e63fa104 100644
--- a/research-system/src/main/java/com/research/system/domain/po/PrjProjOrg.java
+++ b/research-system/src/main/java/com/research/system/domain/po/PrjProjOrg.java
@@ -50,6 +50,10 @@ public class PrjProjOrg implements Serializable {
private Integer xsjl;
+ private String contactName;
+
+ private String contactPhone;
+
private String orgIntro;
private static final long serialVersionUID = 1L;
@@ -238,6 +242,22 @@ public class PrjProjOrg implements Serializable {
this.xsjl = xsjl;
}
+ public String getContactName() {
+ return contactName;
+ }
+
+ public void setContactName(String contactName) {
+ this.contactName = contactName == null ? null : contactName.trim();
+ }
+
+ public String getContactPhone() {
+ return contactPhone;
+ }
+
+ public void setContactPhone(String contactPhone) {
+ this.contactPhone = contactPhone == null ? null : contactPhone.trim();
+ }
+
public String getOrgIntro() {
return orgIntro;
}
@@ -275,6 +295,8 @@ public class PrjProjOrg implements Serializable {
sb.append(", yskt=").append(yskt);
sb.append(", jscgzh=").append(jscgzh);
sb.append(", xsjl=").append(xsjl);
+ sb.append(", contactName=").append(contactName);
+ sb.append(", contactPhone=").append(contactPhone);
sb.append(", orgIntro=").append(orgIntro);
sb.append("]");
return sb.toString();
diff --git a/research-system/src/main/java/com/research/system/domain/po/PrjProjOrgExample.java b/research-system/src/main/java/com/research/system/domain/po/PrjProjOrgExample.java
index c41607ef..8823d63f 100644
--- a/research-system/src/main/java/com/research/system/domain/po/PrjProjOrgExample.java
+++ b/research-system/src/main/java/com/research/system/domain/po/PrjProjOrgExample.java
@@ -1564,6 +1564,146 @@ public class PrjProjOrgExample {
addCriterion("xsjl not between", value1, value2, "xsjl");
return (Criteria) this;
}
+
+ public Criteria andContactNameIsNull() {
+ addCriterion("contact_name is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameIsNotNull() {
+ addCriterion("contact_name is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameEqualTo(String value) {
+ addCriterion("contact_name =", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameNotEqualTo(String value) {
+ addCriterion("contact_name <>", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameGreaterThan(String value) {
+ addCriterion("contact_name >", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameGreaterThanOrEqualTo(String value) {
+ addCriterion("contact_name >=", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameLessThan(String value) {
+ addCriterion("contact_name <", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameLessThanOrEqualTo(String value) {
+ addCriterion("contact_name <=", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameLike(String value) {
+ addCriterion("contact_name like", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameNotLike(String value) {
+ addCriterion("contact_name not like", value, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameIn(List values) {
+ addCriterion("contact_name in", values, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameNotIn(List values) {
+ addCriterion("contact_name not in", values, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameBetween(String value1, String value2) {
+ addCriterion("contact_name between", value1, value2, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactNameNotBetween(String value1, String value2) {
+ addCriterion("contact_name not between", value1, value2, "contactName");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneIsNull() {
+ addCriterion("contact_phone is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneIsNotNull() {
+ addCriterion("contact_phone is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneEqualTo(String value) {
+ addCriterion("contact_phone =", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneNotEqualTo(String value) {
+ addCriterion("contact_phone <>", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneGreaterThan(String value) {
+ addCriterion("contact_phone >", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneGreaterThanOrEqualTo(String value) {
+ addCriterion("contact_phone >=", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneLessThan(String value) {
+ addCriterion("contact_phone <", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneLessThanOrEqualTo(String value) {
+ addCriterion("contact_phone <=", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneLike(String value) {
+ addCriterion("contact_phone like", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneNotLike(String value) {
+ addCriterion("contact_phone not like", value, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneIn(List values) {
+ addCriterion("contact_phone in", values, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneNotIn(List values) {
+ addCriterion("contact_phone not in", values, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneBetween(String value1, String value2) {
+ addCriterion("contact_phone between", value1, value2, "contactPhone");
+ return (Criteria) this;
+ }
+
+ public Criteria andContactPhoneNotBetween(String value1, String value2) {
+ addCriterion("contact_phone not between", value1, value2, "contactPhone");
+ return (Criteria) this;
+ }
}
public static class Criteria extends GeneratedCriteria {
diff --git a/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java b/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java
index 69790a61..9c76ab88 100644
--- a/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java
+++ b/research-system/src/main/java/com/research/system/domain/vo/ClientPrjProjInfoVo.java
@@ -110,7 +110,23 @@ public class ClientPrjProjInfoVo {
private Integer xsjl;
private Integer total;
+ private Integer xslwNum;
+ private Integer zlsqysqNum;
+
+ private Integer rjzzqNum;
+
+ private Integer xszzNum;
+
+ private Integer bzzdNum;
+
+ private Integer ysktNum;
+
+ private Integer jscgzhNum;
+
+ private Integer xsjlNum;
+ private String contactName;
+ private String contactPhone;
}
@Data
diff --git a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java
index 89a61bc9..13f3cfb4 100644
--- a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java
+++ b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java
@@ -41,6 +41,27 @@ public class GroupVO {
private Date createTime;
private String projOrgName;
private String completionPercentage= "0";
+
+ @ApiModelProperty("负责人手机号")
+ private String phone;
+ @ApiModelProperty("负责人")
+ private String name;
+
+ private Integer xslwNum;
+
+ private Integer zlsqysqNum;
+
+ private Integer rjzzqNum;
+
+ private Integer xszzNum;
+
+ private Integer bzzdNum;
+
+ private Integer ysktNum;
+
+ private Integer jscgzhNum;
+
+ private Integer xsjlNum;
}
@Data
@@ -89,6 +110,8 @@ public class GroupVO {
private String qualificationName;
private String titleName;
+ @ApiModelProperty("合作单位名称")
+ private String projOrgName;
}
}
diff --git a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
index d1411422..a5762488 100644
--- a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
+++ b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
@@ -138,7 +138,8 @@ public class KtsGroupServiceImpl implements KtsGroupService {
} else {
ktsKtGroupMember.setUpdateBy(SecurityUtils.getUsername());
ktsKtGroupMember.setUpdateTime(new Date());
- ktsKtGroupMemberMapper.updateByPrimaryKeySelective(ktsKtGroupMember);
+ ktsKtGroupMember.setDelFlag((byte) 0);
+ ktsKtGroupMemberMapper.updateByPrimaryKey(ktsKtGroupMember);
return ktsKtGroupMember;
}
}
diff --git a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml
index 594b09c3..11b22680 100644
--- a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml
+++ b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml
@@ -24,7 +24,17 @@
o.bzzd,
o.yskt,
o.jscgzh,
- o.xsjl
+ o.xsjl,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 1 ) as xslwNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 11) as zlsqysqNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 21) as rjzzqNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 31) as xszzNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 41) as bzzdNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 51) as ysktNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 61) as jscgzhNum,
+ (select count(*) from ach_achievement where del_flag = 0 and proj_org_id = o.id and category_id_1 = 71) as xsjlNum,
+ o.contact_name as contactName,
+ o.contact_phone as contactPhone
from
prj_proj_org o
left join
diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
index 4aa81843..6eedbc00 100644
--- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
+++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
@@ -15,7 +15,9 @@
g.create_by as createBy,
g.create_time as createTime,
o.org_name as projOrgName,
- pg.kt_group_name as parentKtName
+ pg.kt_group_name as parentKtName,
+ g.name as name,
+ g.phone as phone
from kts_kt_group g
left join
prj_proj_org o on g.proj_org_id = o.id
@@ -32,6 +34,7 @@
and g.kt_group_name like concat('%',#{dto.ktGroupName},'%')
+ group by g.id
order by g.id desc
@@ -58,13 +61,15 @@
m.create_time as createTime,
g.kt_group_name as ktGroupName,
d1.dict_label as qualificationName,
- d2.dict_label as titleName
+ d2.dict_label as titleName,
+ o.org_name as projOrgName
from
kts_kt_group_member m
left join
kts_kt_group g on m.kt_group_id = g.id
left join sys_dict_data d1 on d1.dict_value = m.qualification and d1.dict_type = 'qualification'
- left join sys_dict_data d2 on d2.dict_value = m.title and d2.dict_type = 'title'
+ left join sys_dict_data d2 on d2.dict_value = m.title and d2.dict_type = 'sys_title'
+ left join prj_proj_org o on o.id = g.proj_org_id
where 1=1
and m.del_flag = 0
diff --git a/research-system/src/main/resources/mapper/system/KtsKtGroupMapper.xml b/research-system/src/main/resources/mapper/system/KtsKtGroupMapper.xml
index b0b03327..eca58f85 100644
--- a/research-system/src/main/resources/mapper/system/KtsKtGroupMapper.xml
+++ b/research-system/src/main/resources/mapper/system/KtsKtGroupMapper.xml
@@ -16,6 +16,8 @@
+
+
@@ -77,7 +79,7 @@
id, proj_id, proj_org_id, parent_kt_id, kt_group_name, sort, intro, kt_group_status,
- del_flag, create_by, create_time, update_by, update_time, remark
+ del_flag, create_by, create_time, update_by, update_time, remark, name, phone