Browse Source

阿米巴开发

anderx 3 years ago
parent
commit
26ba1afdff

+ 1 - 0
src/main/java/com/goafanti/ambSystem/bo/OutAmb.java

@@ -13,6 +13,7 @@ public class OutAmb {
     private String  financeName;
     private String  accountantName;
 
+
     public String getAccountantName() {
         return accountantName;
     }

+ 73 - 0
src/main/java/com/goafanti/ambSystem/bo/OutAmbDtails.java

@@ -0,0 +1,73 @@
+package com.goafanti.ambSystem.bo;
+
+
+import com.goafanti.common.model.AmbSystem;
+
+public class OutAmbDtails extends AmbSystem {
+    /**
+     * 部门id
+     */
+    private Long id;
+    private String name;
+    private String ancestorsNames;
+    private String leaderName;
+    private String  financeName;
+    private String  accountantName;
+    private String  createTimes;
+
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
+
+    public String getAccountantName() {
+        return accountantName;
+    }
+
+    public void setAccountantName(String accountantName) {
+        this.accountantName = accountantName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAncestorsNames() {
+        return ancestorsNames;
+    }
+
+    public void setAncestorsNames(String ancestorsNames) {
+        this.ancestorsNames = ancestorsNames;
+    }
+
+    public String getLeaderName() {
+        return leaderName;
+    }
+
+    public void setLeaderName(String leaderName) {
+        this.leaderName = leaderName;
+    }
+
+    public String getFinanceName() {
+        return financeName;
+    }
+
+    public void setFinanceName(String financeName) {
+        this.financeName = financeName;
+    }
+}

+ 4 - 0
src/main/java/com/goafanti/ambSystem/controller/AmbApiController.java

@@ -67,6 +67,10 @@ public class AmbApiController extends CertifyApiController {
 	@RequestMapping(value="/details",method = RequestMethod.GET)
 	public Result detailsAmb( InputAmb in){
 		Result res =new Result();
+		if (in.getId()==null){
+			res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"巴编号"));
+			return res;
+		}
 		res.data(ambService.detailsAmb(in));
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/ambSystem/service/Impl/AmbServiceImpl.java

@@ -95,7 +95,7 @@ public class AmbServiceImpl extends BaseMybatisDao<AmbSystemMapper> implements A
 
     @Override
     public Object detailsAmb(InputAmb in) {
-        return ambSystemMapper.selectByPrimaryKey(in.getId());
+        return ambSystemMapper.selectDtailsAmb(in.getId());
     }
 
     private void pushLvl(AmbAll a , List<AmbAll> list) {

+ 3 - 0
src/main/java/com/goafanti/common/dao/AmbSystemMapper.java

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.ambSystem.bo.AmbAll;
 import com.goafanti.ambSystem.bo.OutAmb;
+import com.goafanti.ambSystem.bo.OutAmbDtails;
 import com.goafanti.common.model.AmbSystem;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface AmbSystemMapper {
     List<AmbSystem> selectByParentId(Long id);
 
     int selectByName(String name);
+
+    OutAmbDtails selectDtailsAmb(Long id);
 }

+ 11 - 0
src/main/java/com/goafanti/common/mapper/AmbSystemMapper.xml

@@ -289,4 +289,15 @@
       from amb_system
       where name= #{name}
     </select>
+  <select id="selectDtailsAmb" resultType="com.goafanti.ambSystem.bo.OutAmbDtails">
+    select a.id,a.name,a.parent_id parentId,a.accountant,a.lvl,a.status,a.ancestors,
+           a.ancestors_names ancestorsNames,a.order_num orderNum,a.remarks,
+           date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes,
+           b.name leaderName,c.name financeName,d.name accountantName
+    from amb_system a
+           left join admin b on a.leader =b.id
+           left join admin c on a.finance_id =c.id
+           left join admin d on a.accountant =d.id
+    where a.id= #{id}
+  </select>
 </mapper>