fix

virgo.core/src/main/java/com/bosshand/virgo/core/dao/UserInfoDao.java

@@ -0,0 +1,15 @@
+package com.bosshand.virgo.core.dao;
+
+import com.bosshand.virgo.core.model.UserInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserInfoDao {
+
+    public int save(UserInfo userInfo);
+
+    public int update(UserInfo userInfo);
+
+    public UserInfo get(UserInfo userInfo);
+
+}

virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrOrganization.java

@@ -22,6 +22,11 @@ public class MgrOrganization implements BaseModel {
 
     private String businessLicense;
 
+    /**
+     * 简介
+     */
+    private String introduction;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date registerDate;
 
@@ -107,6 +112,14 @@ public class MgrOrganization implements BaseModel {
         this.businessLicense = businessLicense;
     }
 
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
     public Date getRegisterDate() {
         return registerDate;
     }

virgo.core/src/main/java/com/bosshand/virgo/core/model/UserInfo.java

@@ -0,0 +1,192 @@
+package com.bosshand.virgo.core.model;
+
+public class UserInfo {
+
+    private long id;
+
+    private long organizationId;
+
+    private String organizationName;
+
+    private long projectId;
+
+    private String projectName;
+
+    private long projectItemId;
+
+    private String projectItemName;
+
+    private long projectItemTargetId;
+
+    private String projectItemTargetName;
+
+    private long projectItemTargetRoomId;
+
+    private String projectItemTargetRoomName;
+
+    private String entryDate;
+
+    private long userId;
+
+    private int state;
+    /**
+     * 员工岗位
+     */
+    private String employeePosition;
+    /**
+     * 职务
+     */
+    private String position;
+    /**
+     * 工作业务
+     */
+    private String workBusiness;
+    /**
+     * 预留字段
+     */
+    private String data;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getOrganizationId() {
+        return organizationId;
+    }
+
+    public void setOrganizationId(long organizationId) {
+        this.organizationId = organizationId;
+    }
+
+    public String getOrganizationName() {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName) {
+        this.organizationName = organizationName;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public long getProjectItemId() {
+        return projectItemId;
+    }
+
+    public void setProjectItemId(long projectItemId) {
+        this.projectItemId = projectItemId;
+    }
+
+    public String getProjectItemName() {
+        return projectItemName;
+    }
+
+    public void setProjectItemName(String projectItemName) {
+        this.projectItemName = projectItemName;
+    }
+
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public String getProjectItemTargetName() {
+        return projectItemTargetName;
+    }
+
+    public void setProjectItemTargetName(String projectItemTargetName) {
+        this.projectItemTargetName = projectItemTargetName;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
+    public String getProjectItemTargetRoomName() {
+        return projectItemTargetRoomName;
+    }
+
+    public void setProjectItemTargetRoomName(String projectItemTargetRoomName) {
+        this.projectItemTargetRoomName = projectItemTargetRoomName;
+    }
+
+    public String getEntryDate() {
+        return entryDate;
+    }
+
+    public void setEntryDate(String entryDate) {
+        this.entryDate = entryDate;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public String getEmployeePosition() {
+        return employeePosition;
+    }
+
+    public void setEmployeePosition(String employeePosition) {
+        this.employeePosition = employeePosition;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public String getWorkBusiness() {
+        return workBusiness;
+    }
+
+    public void setWorkBusiness(String workBusiness) {
+        this.workBusiness = workBusiness;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+}

virgo.core/src/main/resources/mapper/MgrOrganizationMapper.xml

@@ -12,6 +12,7 @@
 	<result column="contactTel" property="contactTel"/>
 	<result column="address" property="address"/>
 	<result column="businessLicense" property="businessLicense"/>
+	<result column="introduction" property="introduction"/>
 	<result column="registerDate" property="registerDate"/>
 	<result column="status" property="status"/>
 	<result column="organizedDataCenter" property="organizedDataCenter"/>
@@ -91,7 +92,8 @@
 </select>
 
 <insert id="insert" parameterType="com.bosshand.virgo.core.model.MgrOrganization" useGeneratedKeys="true" keyProperty="id">
-	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, registerDate, status, organizationCode) values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, now(), #{status}, #{organizationCode})
+	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode)
+	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode})
 </insert>
 
 <update id="update" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
@@ -104,6 +106,7 @@
 		<if test="contactTel!=null">contactTel=#{contactTel},</if>
 		<if test="address!=null">address=#{address},</if>
 		<if test="businessLicense!=null">businessLicense=#{businessLicense},</if>
+		<if test="introduction!=null">introduction=#{introduction},</if>
 		<if test="registerDate!=null">registerDate=#{registerDate},</if>
 		<if test="organizedDataCenter!=0">organizedDataCenter=#{organizedDataCenter},</if>
 	</trim>

virgo.core/src/main/resources/mapper/UserInfoMapper.xml

@@ -0,0 +1,83 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bosshand.virgo.core.dao.UserInfoDao">
+
+    <resultMap type="com.bosshand.virgo.core.model.UserInfo" id="result" >
+        <id column="id" property="id"/>
+        <result column="organizationId" property="organizationId"/>
+        <result column="organizationName" property="organizationName"/>
+        <result column="projectId" property="projectId"/>
+        <result column="projectName" property="projectName"/>
+        <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemName" property="projectItemName"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetName" property="projectItemTargetName"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
+        <result column="projectItemTargetRoomName" property="projectItemTargetRoomName"/>
+        <result column="entryDate" property="entryDate"/>
+        <result column="userId" property="userId"/>
+        <result column="state" property="state"/>
+        <result column="employeePosition" property="employeePosition"/>
+        <result column="position" property="position"/>
+        <result column="workBusiness" property="workBusiness"/>
+        <result column="data" property="data"/>
+    </resultMap>
+
+    <select id="get" resultMap="result">
+        select * from mgr_user_info
+        <where>
+            <if test="organizationId != 0">
+                and organizationId = #{organizationId}
+            </if>
+            <if test="projectId != 0">
+                and projectId = #{projectId}
+            </if>
+            <if test="projectItemId != 0">
+                and projectItemId = #{projectItemId}
+            </if>
+            <if test="projectItemTargetId != 0">
+                and projectItemTargetId = #{projectItemTargetId}
+            </if>
+            <if test="projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            </if>
+            <if test="userId != 0">
+                and userId = #{userId}
+            </if>
+        </where>
+    </select>
+
+    <insert id="save" parameterType="com.bosshand.virgo.core.model.UserInfo" useGeneratedKeys="true" keyProperty="id">
+        INSERT into mgr_user_info(organizationId, organizationName, projectId, projectName, projectItemId, projectItemName, projectItemTargetId, projectItemTargetName,
+                                  projectItemTargetRoomId, projectItemTargetRoomName, entryDate, userId, state, employeePosition, position, workBusiness, data)
+        values(#{organizationId}, #{organizationName}, #{projectId}, #{projectName}, #{projectItemId},#{projectItemName}, #{projectItemTargetId}, #{projectItemTargetName},
+               #{projectItemTargetRoomId},#{projectItemTargetRoomName}, #{entryDate}, #{userId}, #{state}, #{employeePosition}, #{position}, #{workBusiness}, #{data})
+    </insert>
+
+    <update id="update" parameterType="com.bosshand.virgo.core.model.UserInfo">
+        UPDATE mgr_user_info
+        <trim prefix="set" suffixOverrides=",">
+            <if test="organizationId!=0">organizationId=#{organizationId},</if>
+            <if test="organizationName!=null">organizationName=#{organizationName},</if>
+            <if test="projectId!=0">projectId=#{projectId},</if>
+            <if test="projectName!=null">projectName=#{projectName},</if>
+            <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
+            <if test="projectItemName!=null">projectItemName=#{projectItemName},</if>
+            <if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>
+            <if test="projectItemTargetName!=null">projectItemTargetName=#{projectItemTargetName},</if>
+            <if test="projectItemTargetRoomId!=0">projectItemTargetRoomId=#{projectItemTargetRoomId},</if>
+            <if test="projectItemTargetRoomName!=null">projectItemTargetRoomName=#{projectItemTargetRoomName},</if>
+            <if test="entryDate!=null">entryDate=#{entryDate},</if>
+            <if test="userId!=0">userId=#{userId},</if>
+            <if test="state!=0">state=#{state},</if>
+            <if test="employeePosition!=null">employeePosition=#{employeePosition},</if>
+            <if test="position!=null">position=#{position},</if>
+            <if test="workBusiness!=null">workBusiness=#{workBusiness},</if>
+            <if test="data!=null">data=#{data},</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+</mapper>

virgo.file/src/main/java/com/bosshand/virgo/file/seal/controller/SealController.java

@@ -34,6 +34,12 @@ public class SealController {
         return Response.ok(sealService.getList(organizationId));
     }
 
+    @ApiOperation(value = "印章", notes = "根据type印章列表")
+    @RequestMapping(value = "/seal/type/{organizationId}/{type}", method = RequestMethod.GET)
+    public Response getTypeList(@PathVariable int organizationId, @PathVariable int type) {
+        return Response.ok(sealService.getTypeList(organizationId, type));
+    }
+
     @OperationControllerLog(module = "公司管理", operation = "印章管理-查看申请印章")
     @ApiOperation(value = "印章", notes = "申请印章列表分页")
     @RequestMapping(value = "/sealRequest/{sealId}/{currPage}/{pageSize}", method = RequestMethod.GET)

virgo.file/src/main/java/com/bosshand/virgo/file/seal/dao/SealDao.java

@@ -13,6 +13,7 @@ public interface SealDao {
 	public int save(Seal seal);
 	public int delete(int id);
 	public List<Seal> getList(int organizationId);
+	public List<Seal> getTypeList(int organizationId, int type);
 	public int update(Seal seal);
 	public int updateState(int id);
 

virgo.file/src/main/java/com/bosshand/virgo/file/seal/model/Seal.java

@@ -12,7 +12,12 @@ import java.util.List;
 public class Seal {
 	
 	private int id;
-	
+
+	/**
+	 * 分类 1：公章、2：财务章、3：法人章、4：项目章、5：合同章、6：资料章
+	 */
+	private int type;
+
 	private String name;
 
 	private String comment;
@@ -46,6 +51,14 @@ public class Seal {
 		this.id = id;
 	}
 
+	public int getType() {
+		return type;
+	}
+
+	public void setType(int type) {
+		this.type = type;
+	}
+
 	public String getName() {
 		return name;
 	}

virgo.file/src/main/java/com/bosshand/virgo/file/seal/service/SealService.java

@@ -40,6 +40,10 @@ public class SealService {
 		return sealDao.getList(organizationId);
 	}
 
+	public List<Seal> getTypeList(int organizationId, int type) {
+		return sealDao.getTypeList(organizationId, type);
+	}
+
 	public List<SealRequest> listSealRequest(int sealId, int currPage, int pageSize){
 		Map<String, Object> data = new HashMap<String, Object>();
 		data.put("sealId", sealId);

virgo.file/src/main/resources/mapper/SealMapper.xml

@@ -6,6 +6,7 @@
 
 <resultMap type="com.bosshand.virgo.file.seal.model.Seal" id="SealResult" >
 		<id column="id" property="id"/>
+		<id column="type" property="type"/>
 		<id column="name" property="name"/>
 		<id column="comment" property="comment"/>
 		<id column="createTime" property="createTime"/>
@@ -22,6 +23,7 @@
 <resultMap type="com.bosshand.virgo.file.seal.model.Seal" id="SealResultA" >
 	<id column="id" property="id"/>
 	<id column="name" property="name"/>
+	<id column="type" property="type"/>
 	<id column="comment" property="comment"/>
 	<id column="createTime" property="createTime"/>
 	<id column="createUserId" property="createUserId"/>
@@ -88,6 +90,11 @@
 	where s.organizationId = #{organizationId} and s.state = 0
 </select>
 
+<select id="getTypeList" resultMap="SealResult">
+	<include refid="queryA"/>
+	where s.organizationId = #{organizationId} and s.type = #{type}  and s.state = 0
+</select>
+
 <select id="get" resultMap="SealResult">
 	<include refid="queryA"/>
 	where s.id = #{id} 
@@ -110,7 +117,8 @@
 </select>
 
 <insert id="save" parameterType="com.bosshand.virgo.file.seal.model.Seal" useGeneratedKeys="true" keyProperty="id">
-	INSERT INTO seal(name, comment, createTime, createUserId, userIds, createUserName, fileNodeId, organizationId) VALUES (#{name}, #{comment}, now(), #{createUserId}, #{userIds}, #{createUserName}, #{fileNodeId}, #{organizationId})
+	INSERT INTO seal(type, name, comment, createTime, createUserId, userIds, createUserName, fileNodeId, organizationId)
+	VALUES (#{type}, #{name}, #{comment}, now(), #{createUserId}, #{userIds}, #{createUserName}, #{fileNodeId}, #{organizationId})
 </insert>
 
 <delete id="delete">
@@ -120,6 +128,7 @@
 <update id="update" parameterType="com.bosshand.virgo.file.seal.model.Seal">
 	update seal
 	<trim prefix="set" suffixOverrides=",">
+		<if test="type!=0">type=#{type},</if>
 		<if test="name!=null">name=#{name},</if>
 		<if test="comment!=null">comment=#{comment},</if>
 		<if test="createTime==null">createTime=now(),</if>

virgo.manager/src/main/java/com/bosshand/virgo/controller/InfoController.java

@@ -0,0 +1,41 @@
+package com.bosshand.virgo.controller;
+
+import com.bosshand.virgo.core.model.UserInfo;
+import com.bosshand.virgo.core.response.Response;
+import com.bosshand.virgo.service.UserInfoService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("info")
+public class InfoController {
+
+    @Autowired
+    UserInfoService userInfoService;
+
+    @ApiOperation(value = "绑定", notes = "绑定")
+    @RequestMapping(value = "", method = RequestMethod.POST)
+    public Response save(@RequestBody UserInfo userInfo) {
+        userInfoService.save(userInfo);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "修改", notes = "修改")
+    @RequestMapping(value = "", method = RequestMethod.PUT)
+    public Response update(@RequestBody UserInfo userInfo) {
+        userInfoService.update(userInfo);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "获取", notes = "获取")
+    @RequestMapping(value = "/get", method = RequestMethod.POST)
+    public Response get(@RequestBody UserInfo userInfo) {
+        return Response.ok(userInfoService.get(userInfo));
+    }
+
+}
+

virgo.manager/src/main/java/com/bosshand/virgo/message/dao/CompleteDataDao.java

@@ -1,18 +1,19 @@
 package com.bosshand.virgo.message.dao;
 
-import java.util.List;
-
+import com.bosshand.virgo.message.model.CompleteData;
 import org.apache.ibatis.annotations.Mapper;
 
-import com.bosshand.virgo.message.model.CompleteData;
+import java.util.List;
 
 @Mapper
 public interface CompleteDataDao {
 
-	public int insert(CompleteData completeData);
+    int insert(CompleteData completeData);
+
+    List<CompleteData> getByProjecitFlowId(long projecitFlowId);
 
-	public List<CompleteData> getByProjecitFlowId(long projecitFlowId);
+    CompleteData getDocumentId(int documentId);
 
-	public CompleteData getDocumentId(int documentId);
+    CompleteData get(long id);
 
 }

virgo.manager/src/main/java/com/bosshand/virgo/message/service/CompleteDataService.java

@@ -1,12 +1,5 @@
 package com.bosshand.virgo.message.service;
 
-import java.util.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bosshand.virgo.core.utils.FileUtil;
@@ -16,6 +9,12 @@ import com.bosshand.virgo.exception.ServiceException;
 import com.bosshand.virgo.message.dao.CompleteDataDao;
 import com.bosshand.virgo.message.model.CompleteData;
 import com.bosshand.virgo.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service
 public class CompleteDataService {
@@ -47,7 +46,7 @@ public class CompleteDataService {
 		String chainTxHash = fileClient.upChain(completeData.getData());
 		completeData.setChainTxHash(chainTxHash);
 		completeDataDao.insert(completeData);
-		return completeData;
+		return completeDataDao.get(completeData.getId());
 	}
 	
 	public void saveCompleteData(Map map) {

virgo.manager/src/main/java/com/bosshand/virgo/service/UserInfoService.java

@@ -0,0 +1,30 @@
+package com.bosshand.virgo.service;
+
+import com.bosshand.virgo.core.dao.UserInfoDao;
+import com.bosshand.virgo.core.model.UserInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserInfoService {
+
+    @Autowired
+    UserInfoDao userInfoDao;
+
+    public int save(UserInfo userInfo) {
+        UserInfo info = userInfoDao.get(userInfo);
+        if (info != null) {
+            return 0;
+        }
+        return userInfoDao.save(userInfo);
+    }
+
+    public int update(UserInfo userInfo) {
+        return userInfoDao.update(userInfo);
+    }
+
+    public UserInfo get(UserInfo userInfo) {
+        return userInfoDao.get(userInfo);
+    }
+
+}

virgo.manager/src/main/resources/mapper/CompleteData.xml

@@ -10,7 +10,11 @@
 		<result column="data" property="data"/>
 		<result column="chainTxHash" property="chainTxHash"/>
 	</resultMap>
-	
+
+	<select id="get" resultMap="completeDataResult">
+		select * from complete_data where id = #{id}
+	</select>
+
 	<select id="getDocumentId" resultMap="completeDataResult">
 		select * from complete_data where documentId = #{documentId}
 	</select>