diff --git a/docs/脚本/Mysql/0818补丁.sql b/docs/脚本/Mysql/0818补丁.sql new file mode 100644 index 00000000..939516f6 --- /dev/null +++ b/docs/脚本/Mysql/0818补丁.sql @@ -0,0 +1,28 @@ +update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='job_name'; +update jcl_field_extendinfo set isrequired = 1 where table_name ='JCL_ORG_JOB' and field_name ='ec_company'; +update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"行业","replaceDatas":[{"itemorderid":"63","name":"行业","id":"63","parenttitle":"客户","title":"客户-行业"}],"value":"63"}]' where table_name ='JCL_ORG_COMP' and field_name='industry' ; +update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]' where table_name ='JCL_ORG_COMP' and field_name='comp_principal' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_COMP' and field_name='description' ; +update jcl_field_extendinfo set custom_value='["browser",{"valueSpan":"人力资源","replaceDatas":[{"name":"人力资源","id":"1"}],"value":"1"}]' where table_name ='JCL_ORG_DEPT' and field_name='dept_principal' ; +update jcl_field_extendinfo set custom_value='["input","int"]' where table_name ='JCL_ORG_DEPT' and field_name='show_order' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_DEPT' and field_name='description' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='description' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='work_duty' ; +update jcl_field_extendinfo set custom_value='["textarea","",""]' where table_name ='JCL_ORG_JOB' and field_name='work_authority'; +update jcl_field_extendinfo set browser_type='666', custom_value='["browser",{"valueSpan":"聚才林岗位","replaceDatas":[{"itemorderid":"0","name":"聚才林岗位","id":"666","parenttitle":"资产","title":"资产-聚才林岗位"}],"value":"666"}]' where table_name ='JCL_ORG_JOB' and field_name='parent_job'; + + +delete from SystemRightDetail where rightid =2714; +delete from SystemRightsLanguage where id =2714; +delete from SystemRights where id =2714; +delete from SystemRightToGroup where rightid =2714; +delete from SystemRightType where id =37; +delete from SystemRightGroups where id =-23; +insert into SystemRights (id,rightdesc,righttype,detachable) values (2714,'组织数据导入','37',0); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,8,'Organization data import','Organization data import'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,9,'組織數據導入','組織數據導入'); +insert into SystemRightsLanguage (id,languageid,rightname,rightdesc) values (2714,7,'组织数据导入','组织数据导入'); +insert into SystemRightDetail (id,rightdetailname,rightdetail,rightid) values (43998,'组织数据导入权限','DataImport:All',2714); +insert into SystemRightToGroup(rightid,groupid) values (2714,-23); +insert into SystemRightGroups (id,rightgroupmark, rightgroupname, rightgroupremark) values(-23,'ORGANIZATION','组织管理权限组','组织管理'); +insert into SystemRightType(id,rightTypeName,rightTypeDesc) VALUES (37,'组织管理','组织管理'); \ No newline at end of file diff --git a/docs/脚本/Mysql/浏览按钮mysql.sql b/docs/脚本/Mysql/浏览按钮mysql.sql index 55e6f365..9b7e65cc 100644 --- a/docs/脚本/Mysql/浏览按钮mysql.sql +++ b/docs/脚本/Mysql/浏览按钮mysql.sql @@ -40,7 +40,7 @@ select @datashowset_id:= max(id) from datashowset; INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, @current_date, @current_time, NULL, NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 1, 1, uuid(), NULL); INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 0, 2, uuid(), NULL); -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职务分类', 'post_id', '', 0, 3, uuid(), NULL); +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职务分类', 'post_id', 'select post_name from jcl_org_post where id = {?currentvalue}', 0, 3, uuid(), NULL); INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'post_info_no', '2', '', 1, uuid(), ''); INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_info_name', '2', '', 2, uuid(), ''); diff --git a/docs/脚本/SqlServer/浏览按钮sqlserver.sql b/docs/脚本/SqlServer/浏览按钮sqlserver.sql index 7ccf88ad..dfdda47c 100644 --- a/docs/脚本/SqlServer/浏览按钮sqlserver.sql +++ b/docs/脚本/SqlServer/浏览按钮sqlserver.sql @@ -60,7 +60,7 @@ set @datashowset_id = (select max(id) from datashowset) INSERT INTO datashowcacheset(showname, subcompanyid, isopencache, Createdate, createtime, Updatedate, Updatetime) VALUES ('PostInfoBrowser', '0', 0, @current_date, @current_time, NULL, NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '编号', 'post_info_no', '', 1, 1, newid(), NULL) INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '名称', 'post_info_name', '', 0, 2, newid(), NULL) -INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职务分类', 'post_id', '', 0, 3, newid(), NULL) +INSERT INTO datashowparam (MAINID, FIELDNAME, SEARCHNAME, TRANSQL, ISSHOWNAME, dsporder, uuid, width) VALUES(@datashowset_id, '职务分类', 'post_id', 'select post_name from jcl_org_post where id = {?currentvalue}', 0, 3, newid(), NULL) INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '编号', 'post_info_no', '2', '', 1, newid(), '') INSERT INTO datasearchparam (MAINID, FIELDNAME, SEARCHNAME, FIELDTYPE, WOKFLOWFIELDNAME, dsporder, uuid, isshowfield) VALUES(@datashowset_id, '名称', 'post_info_name', '2', '', 2, newid(), '') GO diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 25553f16..67d1eb68 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -517,3 +517,30 @@ create table JCL_ORG_HRMRELATION ( update_time datetime null, constraint JCL_ORG_HRMRELATION_PK primary key (id) ); + + +-- JCL_ORG_ITEMCLASS +create table JCL_ORG_ITEMCLASS ( + fid int auto_increment not null, + fno varchar(50) not null, + fname varchar (50) not null, + fmemo varchar (255) null , + creator int null, + create_time date null, + update_time date null, + constraint JCL_ORG_ITEMCLASS_PK primary key (fid) +); + +-- JCL_ORG_ITEM +create table JCL_ORG_ITEM ( + fid int auto_increment not null, + fclassid int not null, + fno varchar(50) not null, + fname varchar (255) not null, + fmemo varchar (255) null, + fdelete int not null, + creator int null, + create_time date null, + update_time date null, + constraint JCL_ORG_ITEM_PK primary key (fid) +); \ No newline at end of file diff --git a/src/com/api/organization/web/ResourceBasicInfoController.java b/src/com/api/organization/web/ResourceBasicInfoController.java new file mode 100644 index 00000000..c7cc6712 --- /dev/null +++ b/src/com/api/organization/web/ResourceBasicInfoController.java @@ -0,0 +1,13 @@ +package com.api.organization.web; + +import javax.ws.rs.Path; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/8/23 + * @Version V1.0 + **/ +@Path("/bs/hrmorganization/resourceBasicInfo") +public class ResourceBasicInfoController extends com.engine.organization.web.ResourceBasicInfoController{ +} diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index ed1c9e78..1743372a 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -36,7 +36,7 @@ public class EmployeeTableVO { @OrganizationTableColumn(text = "姓名", width = "50%", column = "lastname") private String lastname; - @OrganizationTableColumn(text = "性别", width = "50%", column = "sex") + @OrganizationTableColumn(text = "性别", width = "50%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") private String sex; diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java index f890cf96..0b38f620 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java @@ -53,7 +53,7 @@ public class ExtendGroupBO { private static boolean isHasGroup(Long id) { - List titlesByGroupID = MapperProxyFactory.getProxy(ExtendTitleMapper.class).getTitlesByGroupID(id); + List titlesByGroupID = MapperProxyFactory.getProxy(ExtendTitleMapper.class).getTitlesByGroupID(id,null); return titlesByGroupID.size() > 0; } diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 1e389522..a1e7073f 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -103,7 +103,8 @@ public class ExtendInfoBO { .isenable("1".equals(infoFieldParam.getEnable()) ? 1 : 0) .isrequired("1".equals(infoFieldParam.getRequired()) ? 1 : 0) .listShow(1) - .editShow("0".equals(infoFieldParam.getIsModify()) ? 0 : 1) + // .editShow("0".equals(infoFieldParam.getIsModify()) ? 0 : 1) + .editShow(1) .addShow(1) .browserShow(1) .customValue(convertSelectCustom(controlType, infoFieldParam.getFieldType().toString())) diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index e8ea88b0..f55992af 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -94,6 +94,11 @@ public class ExtendInfoFieldParam { String dbLength = "100"; if (fieldType.size() > 2) { dbLength = fieldType.get(2).toString(); + if (Integer.parseInt(dbLength) == 0) { + dbLength = "50"; + fieldType.set(2,"50"); + } + } fp.setSimpleText(Util.getIntValue(browserType, -1), dbLength); } else if (controlType.equals("2")) { diff --git a/src/com/engine/organization/entity/hrmresource/po/ResourceItemClassPO.java b/src/com/engine/organization/entity/hrmresource/po/ResourceItemClassPO.java new file mode 100644 index 00000000..9bc6603f --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/ResourceItemClassPO.java @@ -0,0 +1,33 @@ +package com.engine.organization.entity.hrmresource.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/8/24 + * @Version V1.0 + **/ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ResourceItemClassPO { + + private Integer fid; + + private String fno; + + private String fname; + + private String fmemo; + + private Long creator; + private Date createTime; + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/hrmresource/po/ResourceItemPO.java b/src/com/engine/organization/entity/hrmresource/po/ResourceItemPO.java new file mode 100644 index 00000000..5555c2e7 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/ResourceItemPO.java @@ -0,0 +1,37 @@ +package com.engine.organization.entity.hrmresource.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/8/24 + * @Version V1.0 + **/ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ResourceItemPO { + + private Integer fid; + + private Integer fclassid; + + private String fno; + + private String fname; + + private String fmemo; + + private Integer fdelete; + + private Long creator; + private Date createTime; + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java b/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java new file mode 100644 index 00000000..abf878d6 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/vo/ResourceBasicInfoVO.java @@ -0,0 +1,77 @@ +package com.engine.organization.entity.hrmresource.vo; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OperatePopedom; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/8/23 + * @Version V1.0 + **/ + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "516e81fb-65d4-4010-b916-9f6ab337b199", + fields = "t.fid," + + "t.fno," + + "t.fname," + + "t.fmemo,"+ + "t.fdelete", + fromSql = "FROM jcl_org_item t ", + orderby = "fno", + sortway = "asc", + primarykey = "fid", + operates = { + @OrganizationTableOperate(index = "0", text = "编辑"), + @OrganizationTableOperate(index = "1", text = "删除"), + @OrganizationTableOperate(index = "2", text = "恢复") + }, + tableType = WeaTableType.CHECKBOX, + operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatResourceOperates", otherpara = "column:fdelete" + ) + + +) +public class ResourceBasicInfoVO { + + /** + * 主键 + */ + @OrganizationTableColumn(column = "fid", display = false) + private Integer fId; + + + /** + * 编号 + */ + @OrganizationTableColumn(text = "编号", width = "20%", column = "fno", orderkey = "fno") + private String fNo; + + /** + * 名称 + */ + @OrganizationTableColumn(text = "名称", width = "20%", column = "fname") + private String fName; + + /** + * 说明 + */ + @OrganizationTableColumn(text = "说明", width = "20%", column = "fmemo") + private String fMemo; + + /** + * 状态 + */ + @OrganizationTableColumn(text = "状态", width = "20%", column = "fdelete") + private String fDelete; +} diff --git a/src/com/engine/organization/entity/job/po/JobPO.java b/src/com/engine/organization/entity/job/po/JobPO.java index d635e321..3de9c18a 100644 --- a/src/com/engine/organization/entity/job/po/JobPO.java +++ b/src/com/engine/organization/entity/job/po/JobPO.java @@ -89,6 +89,10 @@ public class JobPO { */ private Integer showOrder; + private String gradeId; + + private String levelId; + private Long creator; private int deleteType; diff --git a/src/com/engine/organization/enums/OperateTypeEnum.java b/src/com/engine/organization/enums/OperateTypeEnum.java index 5a255222..d1ddaa82 100644 --- a/src/com/engine/organization/enums/OperateTypeEnum.java +++ b/src/com/engine/organization/enums/OperateTypeEnum.java @@ -14,7 +14,8 @@ public enum OperateTypeEnum { MOVE("5", "转移"), MERGE("6", "合并"), COPY("7", "复制"), - CANCELED("8", "封存"); + CANCELED("8", "封存"), + RECOVER("9","恢复"); private String value; diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index b4da89d8..4221b0fe 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -223,6 +223,9 @@ description, + + uuid, + forbidden_tag, @@ -262,11 +265,15 @@ #{description}, + + #{uuid}, + 0, - - + + select JCL_ORG_DEPT_ID.currval from dual INSERT INTO jcl_org_dept @@ -308,6 +315,9 @@ description, + + uuid, + forbidden_tag, @@ -347,6 +357,9 @@ #{description}, + + #{uuid}, + 0, diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.java b/src/com/engine/organization/mapper/extend/ExtMapper.java index 7b91636a..2506e584 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.java +++ b/src/com/engine/organization/mapper/extend/ExtMapper.java @@ -1,6 +1,7 @@ package com.engine.organization.mapper.extend; import com.engine.organization.entity.extend.param.ExtendInfoParams; +import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -51,4 +52,6 @@ public interface ExtMapper { * @return */ int updateTable(ExtendInfoParams params); + + int deleteByID(@Param("tableName") String tableName, @Param("id") long id); } diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.xml b/src/com/engine/organization/mapper/extend/ExtMapper.xml index cddb6748..f2029aae 100644 --- a/src/com/engine/organization/mapper/extend/ExtMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtMapper.xml @@ -54,6 +54,11 @@ where id = #{id} + + delete + from ${tableName} + where id = #{id} + select ${fieldName} from ${tableName} + where delete_type = 0 @@ -207,6 +211,7 @@ #{id} + and is_show = '1' order by show_order diff --git a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java new file mode 100644 index 00000000..3ad80eb3 --- /dev/null +++ b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.java @@ -0,0 +1,63 @@ +package com.engine.organization.mapper.hrmresource; + + +import com.engine.organization.entity.TreeData; +import com.engine.organization.entity.hrmresource.po.ResourceItemClassPO; +import com.engine.organization.entity.hrmresource.po.ResourceItemPO; +import org.apache.ibatis.annotations.MapKey; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/8/24 + * @Version V1.0 + **/ +public interface ResourceBasicInfoMapper { + + ArrayList getTreeData(); + + @MapKey("id") + List> browserDatas(@Param("ids") Collection ids); + + + ResourceItemPO getResourceItemByFid(@Param("fid") Integer fid); + + List selectItemByIds(@Param("ids") Collection ids); + + int deleteByIds(@Param("ids") Collection ids); + + int recoverByIds(@Param("ids") Collection ids); + + /** + * delete语句，删除人员信息 + * + * @param ids + * @return + */ + int deleteItemByIds(@Param("ids") Collection ids); + + List selectItemByFNo(@Param("fno") String fno, @Param("fclassid") Integer fclassid); + + int insertIgnoreNull(ResourceItemPO resourceItemPO); + + int update(ResourceItemPO resourceItemPO); + + ResourceItemClassPO getResourceItemClassByFid(@Param("fid") Integer fid); + + List selectItemClassByFNo(@Param("fno") String fno, @Param("fid") Integer fid); + + int saveResourceItemClass(ResourceItemClassPO itemClassPO); + + int updateResourceItemClass(ResourceItemClassPO itemClassPO); + + int deleteResourceItemClass(@Param("fid") Integer fid); + + List getItemByClassId(@Param("fclassid") Integer fclassid, @Param("fdelete") Integer fdelete); + +} diff --git a/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml new file mode 100644 index 00000000..b89e4277 --- /dev/null +++ b/src/com/engine/organization/mapper/hrmresource/ResourceBasicInfoMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE jcl_org_item + SET fdelete = 1 + WHERE fdelete = 0 + AND fid IN + + #{id} + + + + + + UPDATE jcl_org_item + SET fdelete = 0 + WHERE fdelete = 1 + AND fid IN + + #{id} + + + + + + INSERT INTO jcl_org_item + + + fclassid, + + + fno, + + + fname, + + + fmemo, + + + fdelete, + + + creator, + + + create_time, + + + update_time, + + + + + #{fclassid}, + + + #{fno}, + + + #{fname}, + + + #{fmemo}, + + + #{fdelete}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + + + + + + + + + + update jcl_org_item + + fname=#{fname}, + fmemo=#{fmemo}, + update_time=#{updateTime}, + + WHERE fid = #{fid} AND fdelete = 0 + + + + + + + INSERT INTO jcl_org_itemclass + + + fno, + + + fname, + + + fmemo, + + + creator, + + + create_time, + + + update_time, + + + + + #{fno}, + + + #{fname}, + + + #{fmemo}, + + + #{creator}, + + + #{createTime}, + + + #{updateTime}, + + + + + + + + + update jcl_org_itemclass + + fname=#{fname}, + fmemo=#{fmemo}, + update_time=#{updateTime}, + + WHERE fid = #{fid} + + + + delete + from jcl_org_itemclass + where fid = #{fid} + + + delete + from jcl_org_item + where fid IN + + #{id} + + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index 434bed68..f91add76 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -19,6 +19,8 @@ + + @@ -46,7 +48,9 @@ t.work_duty, t.work_authority, t.show_order, - t.forbidden_tag + t.forbidden_tag, + t.grade_id, + t.level_id - + select JCL_ORG_JOB_ID.currval from dual INSERT INTO jcl_org_job diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.xml b/src/com/engine/organization/mapper/scheme/GradeMapper.xml index 9e668044..eecd8dc8 100644 --- a/src/com/engine/organization/mapper/scheme/GradeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/GradeMapper.xml @@ -56,7 +56,7 @@